# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1592890782 -7200
# Node ID 26efd0404d97e489375d77e445166fe82292f700
# Parent  259c33759937456a6ffa44be4c784da304caa425# Parent  2e1564f57542bb685bb76249e4d12053785b0d5c
integration mainline->framework

diff -r 259c33759937 -r 26efd0404d97 OrthancFramework/Sources/Images/ImageProcessing.cpp
--- a/OrthancFramework/Sources/Images/ImageProcessing.cpp	Mon Jun 22 19:04:45 2020 +0200
+++ b/OrthancFramework/Sources/Images/ImageProcessing.cpp	Tue Jun 23 07:39:42 2020 +0200
@@ -2525,4 +2525,37 @@
     FitSize(*target, source);
     return target.release();
   }
+
+    
+  ImageAccessor* ImageProcessing::FitSizeKeepAspectRatio(const ImageAccessor& source,
+                                                         unsigned int width,
+                                                         unsigned int height)
+  {
+    std::unique_ptr<ImageAccessor> target(new Image(source.GetFormat(), width, height, false));
+    Set(*target, 0);
+
+    if (width != 0 &&
+        height != 0 &&
+        source.GetWidth() != 0 &&
+        source.GetHeight() != 0)
+    {
+      float ratio = std::min(static_cast<float>(width) / static_cast<float>(source.GetWidth()),
+                             static_cast<float>(height) / static_cast<float>(source.GetHeight()));
+
+      unsigned int resizedWidth = static_cast<unsigned int>(
+        boost::math::iround(ratio * static_cast<float>(source.GetWidth())));
+
+      unsigned int resizedHeight = static_cast<unsigned int>(
+        boost::math::iround(ratio * static_cast<float>(source.GetHeight())));
+
+      std::unique_ptr<ImageAccessor> resized(FitSize(source, resizedWidth, resizedHeight));
+
+      ImageAccessor region;
+      target->GetRegion(region, (width - resizedWidth) / 2,
+                        (height - resizedHeight) / 2, resizedWidth, resizedHeight);
+      Copy(region, *resized);
+    }
+
+    return target.release();
+  }
 }
diff -r 259c33759937 -r 26efd0404d97 OrthancFramework/Sources/Images/ImageProcessing.h
--- a/OrthancFramework/Sources/Images/ImageProcessing.h	Mon Jun 22 19:04:45 2020 +0200
+++ b/OrthancFramework/Sources/Images/ImageProcessing.h	Tue Jun 23 07:39:42 2020 +0200
@@ -204,10 +204,17 @@
 
     static void FitSize(ImageAccessor& target,
                         const ImageAccessor& source);
-    
+
+    // Resize the image to the given width/height. The resized image
+    // occupies the entire canvas (aspect ratio is not preserved).
     static ImageAccessor* FitSize(const ImageAccessor& source,
                                   unsigned int width,
                                   unsigned int height);
+
+    // Resize an image, but keeps its original aspect ratio. Zeros are
+    // added around the image to reach the specified size.
+    static ImageAccessor* FitSizeKeepAspectRatio(const ImageAccessor& source,
+                                                 unsigned int width,
+                                                 unsigned int height);
   };
 }
-