diff Framework/Algorithms/PyramidReader.cpp @ 217:20bc074ec19a

Viewer can display DICOM pyramids whose tile sizes vary across levels
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 Jan 2021 14:24:18 +0100
parents 1e864138f0da
children 49f647ed1b4c
line wrap: on
line diff
--- a/Framework/Algorithms/PyramidReader.cpp	Tue Jan 12 10:21:36 2021 +0100
+++ b/Framework/Algorithms/PyramidReader.cpp	Tue Jan 12 14:24:18 2021 +0100
@@ -188,7 +188,7 @@
         tile.GetHeight() != sourceTileHeight_)
     {
       LOG(ERROR) << "One tile in the input image has size " << tile.GetWidth() << "x" << tile.GetHeight() 
-                 << " instead of required " << source_.GetTileWidth() << "x" << source_.GetTileHeight();
+                 << " instead of required " << sourceTileWidth_ << "x" << sourceTileHeight_;
       throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize);
     }
   }
@@ -238,8 +238,8 @@
     level_(level),
     levelWidth_(source.GetLevelWidth(level)),
     levelHeight_(source.GetLevelHeight(level)),
-    sourceTileWidth_(source.GetTileWidth()),
-    sourceTileHeight_(source.GetTileHeight()),
+    sourceTileWidth_(source.GetTileWidth(level)),
+    sourceTileHeight_(source.GetTileHeight(level)),
     targetTileWidth_(targetTileWidth),
     targetTileHeight_(targetTileHeight),
     parameters_(parameters)