Mercurial > hg > orthanc-wsi
diff Framework/Inputs/HierarchicalTiff.h @ 297:c1687b8fc800
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 18 Jul 2023 07:13:36 +0200 |
parents | 559499b80da8 |
children | 7020852a8fa9 |
line wrap: on
line diff
--- a/Framework/Inputs/HierarchicalTiff.h Tue Jul 18 06:45:44 2023 +0200 +++ b/Framework/Inputs/HierarchicalTiff.h Tue Jul 18 07:13:36 2023 +0200 @@ -23,9 +23,8 @@ #pragma once #include "PyramidWithRawTiles.h" +#include "../TiffReader.h" -#include <tiff.h> -#include <tiffio.h> #include <vector> #include <boost/thread.hpp> @@ -50,7 +49,7 @@ struct Comparator; boost::mutex mutex_; - TIFF* tiff_; + TiffReader reader_; Orthanc::PixelFormat pixelFormat_; ImageCompression compression_; unsigned int tileWidth_; @@ -58,20 +57,11 @@ std::vector<Level> levels_; Orthanc::PhotometricInterpretation photometric_; - void Finalize(); - void CheckLevel(unsigned int level) const; - bool Initialize(); - public: explicit HierarchicalTiff(const std::string& path); - virtual ~HierarchicalTiff() - { - Finalize(); - } - virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE { return levels_.size(); @@ -111,10 +101,5 @@ { return compression_; } - - static bool GetCurrentDirectoryInformation(TIFF* tiff, - ImageCompression& compression, - Orthanc::PixelFormat& pixelFormat, - Orthanc::PhotometricInterpretation& photometric); }; }