Mercurial > hg > orthanc-wsi

comparison 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
comparison
equal deleted inserted replaced
55:b6432a00b103 56:83cd735c885d
106 106
107 for (size_t i = 1; i < instances_.size(); i++) 107 for (size_t i = 1; i < instances_.size(); i++)
108 { 108 {
109 const DicomPyramidInstance& b = *instances_[i]; 109 const DicomPyramidInstance& b = *instances_[i];
110 110
111 if (a.GetImageCompression() != b.GetImageCompression() || 111 if (a.GetPixelFormat() != b.GetPixelFormat() ||
112 a.GetPixelFormat() != b.GetPixelFormat() ||
113 a.GetTileWidth() != b.GetTileWidth() || 112 a.GetTileWidth() != b.GetTileWidth() ||
114 a.GetTileHeight() != b.GetTileHeight() || 113 a.GetTileHeight() != b.GetTileHeight() ||
115 a.GetTotalWidth() < b.GetTotalWidth() || 114 a.GetTotalWidth() < b.GetTotalWidth() ||
116 a.GetTotalHeight() < b.GetTotalHeight()) 115 a.GetTotalHeight() < b.GetTotalHeight())
117 { 116 {
224 223
225 224
226 ImageCompression DicomPyramid::GetImageCompression() const 225 ImageCompression DicomPyramid::GetImageCompression() const
227 { 226 {
228 assert(!instances_.empty() && instances_[0] != NULL); 227 assert(!instances_.empty() && instances_[0] != NULL);
229 return instances_[0]->GetImageCompression(); 228 return instances_[0]->GetImageCompression(orthanc_);
230 } 229 }
231 230
232 231
233 Orthanc::PixelFormat DicomPyramid::GetPixelFormat() const 232 Orthanc::PixelFormat DicomPyramid::GetPixelFormat() const
234 { 233 {