Mercurial > hg > orthanc-webviewer
diff Plugin/DecodedImageAdapter.cpp @ 145:d850500b8ca6
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 08 Nov 2016 10:15:05 +0100 |
parents | f99adade8b77 |
children | 5dc54316d68b |
line wrap: on
line diff
--- a/Plugin/DecodedImageAdapter.cpp Fri Sep 16 09:19:10 2016 +0200 +++ b/Plugin/DecodedImageAdapter.cpp Tue Nov 08 10:15:05 2016 +0100 @@ -284,8 +284,7 @@ accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetFormat()), image.GetWidth(), image.GetHeight(), image.GetPitch(), image.GetBuffer()); - Orthanc::ImageBuffer buffer; - buffer.SetMinimalPitchForced(true); + std::auto_ptr<Orthanc::ImageBuffer> buffer; Orthanc::ImageAccessor converted; @@ -297,10 +296,11 @@ case Orthanc::PixelFormat_Grayscale8: case Orthanc::PixelFormat_Grayscale16: - buffer.SetFormat(Orthanc::PixelFormat_Grayscale16); - buffer.SetWidth(accessor.GetWidth()); - buffer.SetHeight(accessor.GetHeight()); - converted = buffer.GetAccessor(); + buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale16, + accessor.GetWidth(), + accessor.GetHeight(), + true /* force minimal pitch */)); + converted = buffer->GetAccessor(); Orthanc::ImageProcessing::Convert(converted, accessor); break; @@ -386,8 +386,7 @@ accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetFormat()), image.GetWidth(), image.GetHeight(), image.GetPitch(), image.GetBuffer()); - Orthanc::ImageBuffer buffer; - buffer.SetMinimalPitchForced(true); + std::auto_ptr<Orthanc::ImageBuffer> buffer; Orthanc::ImageAccessor converted; @@ -401,10 +400,12 @@ accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16) { result["Orthanc"]["Stretched"] = true; - buffer.SetFormat(Orthanc::PixelFormat_Grayscale8); - buffer.SetWidth(accessor.GetWidth()); - buffer.SetHeight(accessor.GetHeight()); - converted = buffer.GetAccessor(); + + buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale8, + accessor.GetWidth(), + accessor.GetHeight(), + true /* force minimal pitch */)); + converted = buffer->GetAccessor(); int64_t a, b; Orthanc::ImageProcessing::GetMinMaxValue(a, b, accessor);