Mercurial > hg > orthanc-stone
diff Framework/Toolbox/DicomInstanceParameters.cpp @ 1297:6ab03e429f06 broker
integration mainline->broker
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sun, 23 Feb 2020 15:32:24 +0100 |
| parents | 7ec8fea061b9 ea6c2254536d |
| children | c38c89684d83 |
line wrap: on
line diff
--- a/Framework/Toolbox/DicomInstanceParameters.cpp Tue Feb 04 15:24:03 2020 +0100 +++ b/Framework/Toolbox/DicomInstanceParameters.cpp Sun Feb 23 15:32:24 2020 +0100 @@ -24,6 +24,7 @@ #include "../Scene2D/ColorTextureSceneLayer.h" #include "../Scene2D/FloatTextureSceneLayer.h" #include "../Toolbox/GeometryToolbox.h" +#include "../Toolbox/ImageToolbox.h" #include <Core/Images/Image.h> #include <Core/Images/ImageProcessing.h> @@ -263,7 +264,6 @@ distance <= thickness_ / 2.0); } - void DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image, bool useDouble) const { @@ -375,6 +375,7 @@ false)); Orthanc::ImageProcessing::Convert(*converted, pixelData); + // Correct rescale slope/intercept if need be //data_.ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32)); data_.ApplyRescaleAndDoseScaling(*converted, false);