Mercurial > hg > orthanc-stone

comparison Framework/Layers/FrameRenderer.cpp @ 85:bd48431ac285 wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 26 May 2017 12:20:26 +0200
parents f5f54ed8d307
children 7b14c12a3be5
comparison
equal deleted inserted replaced
83:c75377306598 85:bd48431ac285
109 cairo_matrix_t transform; 109 cairo_matrix_t transform;
110 if (!ComputePixelTransform(transform, viewportSlice, frameSlice, pixelSpacingX, pixelSpacingY)) 110 if (!ComputePixelTransform(transform, viewportSlice, frameSlice, pixelSpacingX, pixelSpacingY))
111 { 111 {
112 return true; 112 return true;
113 } 113 }
114 114
115 x1 = 0; 115 x1 = 0;
116 y1 = 0; 116 y1 = 0;
117 cairo_matrix_transform_point(&transform, &x1, &y1); 117 cairo_matrix_transform_point(&transform, &x1, &y1);
118 118
119 x2 = frameWidth; 119 x2 = frameWidth;
237 } 237 }
238 } 238 }
239 239
240 240
241 ILayerRenderer* FrameRenderer::CreateRenderer(Orthanc::ImageAccessor* frame, 241 ILayerRenderer* FrameRenderer::CreateRenderer(Orthanc::ImageAccessor* frame,
242 const Slice& slice, 242 const Slice& frameSlice,
243 bool isFullQuality) 243 bool isFullQuality)
244 { 244 {
245 std::auto_ptr<Orthanc::ImageAccessor> protect(frame); 245 std::auto_ptr<Orthanc::ImageAccessor> protect(frame);
246 246
247 if (frame->GetFormat() == Orthanc::PixelFormat_RGB24) 247 if (frame->GetFormat() == Orthanc::PixelFormat_RGB24)
248 { 248 {
249 return new ColorFrameRenderer(protect.release(), slice.GetGeometry(), 249 return new ColorFrameRenderer(protect.release(), frameSlice.GetGeometry(),
250 slice.GetPixelSpacingX(), slice.GetPixelSpacingY(), isFullQuality); 250 frameSlice.GetPixelSpacingX(), frameSlice.GetPixelSpacingY(), isFullQuality);
251 } 251 }
252 else 252 else
253 { 253 {
254 return new GrayscaleFrameRenderer(protect.release(), slice.GetConverter(), slice.GetGeometry(), 254 return new GrayscaleFrameRenderer(protect.release(), frameSlice.GetConverter(), frameSlice.GetGeometry(),
255 slice.GetPixelSpacingX(), slice.GetPixelSpacingY(), isFullQuality); 255 frameSlice.GetPixelSpacingX(), frameSlice.GetPixelSpacingY(), isFullQuality);
256 } 256 }
257 } 257 }
258 } 258 }