# HG changeset patch # User Sebastien Jodogne # Date 1592891414 -7200 # Node ID b931ddbe070e748ee607cf3273a4469e71e5d442 # Parent 60be4627ae5220c341f0bd0bbf1f1d5586633047 preserve aspect ratio in SeriesThumbnailsLoader diff -r 60be4627ae52 -r b931ddbe070e Framework/Loaders/SeriesThumbnailsLoader.cpp --- a/Framework/Loaders/SeriesThumbnailsLoader.cpp Mon Jun 22 21:07:39 2020 +0200 +++ b/Framework/Loaders/SeriesThumbnailsLoader.cpp Tue Jun 23 07:50:14 2020 +0200 @@ -562,19 +562,16 @@ if (frame->GetFormat() == Orthanc::PixelFormat_RGB24) { - thumbnail.reset(Orthanc::ImageProcessing::FitSize(*frame, width_, height_)); + thumbnail.reset(Orthanc::ImageProcessing::FitSizeKeepAspectRatio(*frame, width_, height_)); } else { - const unsigned int width = frame->GetWidth(); - const unsigned int height = frame->GetHeight(); - std::unique_ptr converted( - new Orthanc::Image(Orthanc::PixelFormat_Float32, width, height, false)); + new Orthanc::Image(Orthanc::PixelFormat_Float32, frame->GetWidth(), frame->GetHeight(), false)); Orthanc::ImageProcessing::Convert(*converted, *frame); std::unique_ptr resized( - Orthanc::ImageProcessing::FitSize(*converted, width, height)); + Orthanc::ImageProcessing::FitSizeKeepAspectRatio(*converted, width_, height_)); float minValue, maxValue; Orthanc::ImageProcessing::GetMinMaxFloatValue(minValue, maxValue, *resized); @@ -589,7 +586,7 @@ converted.reset(NULL); - thumbnail.reset(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width, height, false)); + thumbnail.reset(new Orthanc::Image(Orthanc::PixelFormat_Grayscale8, width_, height_, false)); Orthanc::ImageProcessing::Convert(*thumbnail, *resized); }