comparison Framework/Layers/ColorFrameRenderer.cpp @ 728:8190213e2279 am-dev

Merged default into am-dev
author Alain Mazy <am@osimis.io>
date Tue, 21 May 2019 13:25:58 +0200
parents 4f2416d519b4
children
comparison
equal deleted inserted replaced
690:f185cfcb72a0 728:8190213e2279
23 23
24 #include <Core/OrthancException.h> 24 #include <Core/OrthancException.h>
25 #include <Core/Images/Image.h> 25 #include <Core/Images/Image.h>
26 #include <Core/Images/ImageProcessing.h> 26 #include <Core/Images/ImageProcessing.h>
27 27
28 namespace OrthancStone 28 namespace Deprecated
29 { 29 {
30 CairoSurface* ColorFrameRenderer::GenerateDisplay(const RenderStyle& style) 30 OrthancStone::CairoSurface* ColorFrameRenderer::GenerateDisplay(const RenderStyle& style)
31 { 31 {
32 std::auto_ptr<CairoSurface> display(new CairoSurface(frame_->GetWidth(), frame_->GetHeight(), false /* no alpha */)); 32 std::auto_ptr<OrthancStone::CairoSurface> display
33 (new OrthancStone::CairoSurface(frame_->GetWidth(), frame_->GetHeight(), false /* no alpha */));
33 34
34 Orthanc::ImageAccessor target; 35 Orthanc::ImageAccessor target;
35 display->GetWriteableAccessor(target); 36 display->GetWriteableAccessor(target);
36 37
37 Orthanc::ImageProcessing::Convert(target, *frame_); 38 Orthanc::ImageProcessing::Convert(target, *frame_);
39 return display.release(); 40 return display.release();
40 } 41 }
41 42
42 43
43 ColorFrameRenderer::ColorFrameRenderer(const Orthanc::ImageAccessor& frame, 44 ColorFrameRenderer::ColorFrameRenderer(const Orthanc::ImageAccessor& frame,
44 const CoordinateSystem3D& framePlane, 45 const OrthancStone::CoordinateSystem3D& framePlane,
45 double pixelSpacingX, 46 double pixelSpacingX,
46 double pixelSpacingY, 47 double pixelSpacingY,
47 bool isFullQuality) : 48 bool isFullQuality) :
48 FrameRenderer(framePlane, pixelSpacingX, pixelSpacingY, isFullQuality), 49 FrameRenderer(framePlane, pixelSpacingX, pixelSpacingY, isFullQuality),
49 frame_(Orthanc::Image::Clone(frame)) 50 frame_(Orthanc::Image::Clone(frame))