Mercurial > hg > orthanc-wsi

comparison Framework/Inputs/PyramidWithRawTiles.cpp @ 57:91fc9583b2de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big refactoring to support sparse tiling
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Nov 2016 17:48:24 +0100
parents 7a88c614be04
children 7a3853d51c45
comparison
equal deleted inserted replaced
56:83cd735c885d 57:91fc9583b2de
31 Orthanc::ImageAccessor* PyramidWithRawTiles::DecodeTile(unsigned int level, 31 Orthanc::ImageAccessor* PyramidWithRawTiles::DecodeTile(unsigned int level,
32 unsigned int tileX, 32 unsigned int tileX,
33 unsigned int tileY) 33 unsigned int tileY)
34 { 34 {
35 std::string tile; 35 std::string tile;
36 if (!ReadRawTile(tile, level, tileX, tileY)) 36 ImageCompression compression;
37
38 if (!ReadRawTile(tile, compression, level, tileX, tileY))
37 { 39 {
38 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); 40 return NULL;
39 } 41 }
40 42
41 std::auto_ptr<Orthanc::ImageAccessor> result; 43 std::auto_ptr<Orthanc::ImageAccessor> result;
42 44
43 switch (GetImageCompression()) 45 switch (compression)
44 { 46 {
45 case ImageCompression_None: 47 case ImageCompression_None:
46 result.reset(new Orthanc::ImageAccessor); 48 result.reset(new Orthanc::ImageAccessor);
47 result->AssignReadOnly(GetPixelFormat(), 49 result->AssignReadOnly(GetPixelFormat(),
48 GetTileWidth(), 50 GetTileWidth(),