Mercurial > hg > orthanc-wsi

diff Framework/Inputs/DicomPyramid.cpp @ 56:83cd735c885d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
speedup the loading of DICOM sources
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Nov 2016 15:41:21 +0100
parents 7a88c614be04
children 91fc9583b2de
line wrap: on
line diff
--- a/Framework/Inputs/DicomPyramid.cpp	Thu Nov 24 14:44:11 2016 +0100
+++ b/Framework/Inputs/DicomPyramid.cpp	Thu Nov 24 15:41:21 2016 +0100
@@ -108,8 +108,7 @@
     {
       const DicomPyramidInstance& b = *instances_[i];
 
-      if (a.GetImageCompression() != b.GetImageCompression() ||
-          a.GetPixelFormat() != b.GetPixelFormat() ||
+      if (a.GetPixelFormat() != b.GetPixelFormat() ||
           a.GetTileWidth() != b.GetTileWidth() ||
           a.GetTileHeight() != b.GetTileHeight() ||
           a.GetTotalWidth() < b.GetTotalWidth() ||
@@ -226,7 +225,7 @@
   ImageCompression DicomPyramid::GetImageCompression() const
   {
     assert(!instances_.empty() && instances_[0] != NULL);
-    return instances_[0]->GetImageCompression();
+    return instances_[0]->GetImageCompression(orthanc_);
   }