Mercurial > hg > orthanc-wsi

changeset 327:4e25eb77cd1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implementation of padding for IIIF
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Oct 2024 17:55:49 +0200
parents 9947e70cbcea
children a57a107b9547
files Framework/Inputs/SingleLevelDecodedPyramid.cpp Framework/Inputs/SingleLevelDecodedPyramid.h
diffstat 2 files changed, 69 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Inputs/SingleLevelDecodedPyramid.cpp	Thu Oct 17 17:24:56 2024 +0200
+++ b/Framework/Inputs/SingleLevelDecodedPyramid.cpp	Thu Oct 17 17:55:49 2024 +0200
@@ -38,9 +38,42 @@
   {
     isEmpty = false;
 
-    Orthanc::ImageAccessor region;
-    image_.GetRegion(region, x, y, target.GetWidth(), target.GetHeight());
-    Orthanc::ImageProcessing::Copy(target, region);
+    if (x + target.GetWidth() <= image_.GetWidth() &&
+        y + target.GetHeight() <= image_.GetHeight())
+    {
+      Orthanc::ImageAccessor region;
+      image_.GetRegion(region, x, y, target.GetWidth(), target.GetHeight());
+      Orthanc::ImageProcessing::Copy(target, region);
+    }
+    else
+    {
+      Orthanc::ImageProcessing::Set(target, backgroundRed_, backgroundGreen_, backgroundBlue_, 255);
+
+      if (x < image_.GetWidth() &&
+          y < image_.GetHeight())
+      {
+        unsigned int w = std::min(image_.GetWidth() - x, target.GetWidth());
+        unsigned int h = std::min(image_.GetHeight() - y, target.GetHeight());
+
+        Orthanc::ImageAccessor a, b;
+        image_.GetRegion(a, x, y, w, h);
+        target.GetRegion(b, 0, 0, w, h);
+
+        Orthanc::ImageProcessing::Copy(b, a);
+      }
+    }
+  }
+
+
+  SingleLevelDecodedPyramid::SingleLevelDecodedPyramid(unsigned int tileWidth,
+                                                       unsigned int tileHeight) :
+    tileWidth_(tileWidth),
+    tileHeight_(tileHeight),
+    padding_(0),
+    backgroundRed_(255),
+    backgroundGreen_(255),
+    backgroundBlue_(255)
+  {
   }
 
 
@@ -51,7 +84,14 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
 
-    return image_.GetWidth();
+    if (padding_ <= 1)
+    {
+      return image_.GetWidth();  // No padding
+    }
+    else
+    {
+      return padding_ * CeilingDivision(image_.GetWidth(), padding_);
+    }
   }
 
 
@@ -62,7 +102,14 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
 
-    return image_.GetHeight();
+    if (padding_ <= 1)
+    {
+      return image_.GetHeight();  // No padding
+    }
+    else
+    {
+      return padding_ * CeilingDivision(image_.GetHeight(), padding_);
+    }
   }
   
 
@@ -82,11 +129,14 @@
   }
 
 
-  void SingleLevelDecodedPyramid::SetPadding(unsigned int paddingAlignement,
-                                             uint8_t paddingRed,
-                                             uint8_t paddingGreen,
-                                             uint8_t paddingBlue)
+  void SingleLevelDecodedPyramid::SetPadding(unsigned int padding,
+                                             uint8_t backgroundRed,
+                                             uint8_t backgroundGreen,
+                                             uint8_t backgroundBlue)
   {
-    throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);  // TODO
+    padding_ = padding;
+    backgroundRed_ = backgroundRed;
+    backgroundGreen_ = backgroundGreen;
+    backgroundBlue_ = backgroundBlue;
   }
 }
--- a/Framework/Inputs/SingleLevelDecodedPyramid.h	Thu Oct 17 17:24:56 2024 +0200
+++ b/Framework/Inputs/SingleLevelDecodedPyramid.h	Thu Oct 17 17:55:49 2024 +0200
@@ -33,6 +33,10 @@
     Orthanc::ImageAccessor  image_;
     unsigned int            tileWidth_;
     unsigned int            tileHeight_;
+    unsigned int            padding_;
+    uint8_t                 backgroundRed_;
+    uint8_t                 backgroundGreen_;
+    uint8_t                 backgroundBlue_;
 
   protected:
     void SetImage(const Orthanc::ImageAccessor& image)
@@ -48,11 +52,7 @@
 
   public:
     SingleLevelDecodedPyramid(unsigned int tileWidth,
-                              unsigned int tileHeight) :
-      tileWidth_(tileWidth),
-      tileHeight_(tileHeight)
-    {
-    }
+                              unsigned int tileHeight);
 
     virtual unsigned int GetTileWidth(unsigned int level) const ORTHANC_OVERRIDE
     {
@@ -80,9 +80,9 @@
 
     virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE;
 
-    void SetPadding(unsigned int paddingAlignement,
-                    uint8_t paddingRed,
-                    uint8_t paddingGreen,
-                    uint8_t paddingBlue);
+    void SetPadding(unsigned int padding,
+                    uint8_t backgroundRed,
+                    uint8_t backgroundGreen,
+                    uint8_t backgroundBlue);
   };
 }