# HG changeset patch # User Sebastien Jodogne # Date 1566987683 -7200 # Node ID b2d4dd16dae807bb6dc26ab6cc46f9d500a71dd9 # Parent 18566f9e1831108b72d5ec5ef545e3c13767d708 removed C++11 primitive diff -r 18566f9e1831 -r b2d4dd16dae8 Core/Images/ImageProcessing.cpp --- a/Core/Images/ImageProcessing.cpp Tue Aug 27 14:26:04 2019 +0200 +++ b/Core/Images/ImageProcessing.cpp Wed Aug 28 12:21:23 2019 +0200 @@ -378,11 +378,11 @@ { float v = (static_cast(*p) + offset) * scaling; - if (v > maxFloatValue) + if (v >= maxFloatValue) { *p = maxPixelValue; } - else if (v < minFloatValue) + else if (v <= minFloatValue) { *p = minPixelValue; } @@ -1090,6 +1090,17 @@ } return; + case PixelFormat_Float32: + if (useRound) + { + ShiftScaleInternal(image, offset, scaling); + } + else + { + ShiftScaleInternal(image, offset, scaling); + } + return; + default: throw OrthancException(ErrorCode_NotImplemented); } diff -r 18566f9e1831 -r b2d4dd16dae8 Core/Logging.cpp --- a/Core/Logging.cpp Tue Aug 27 14:26:04 2019 +0200 +++ b/Core/Logging.cpp Wed Aug 28 12:21:23 2019 +0200 @@ -272,7 +272,7 @@ { std::stringstream ss; ss << "Unknown log level (" << level_ << ") for message: " << message; - auto s = ss.str(); + std::string s = ss.str(); globalErrorLogFunc(s.c_str()); } }