comparison OrthancServer/Internals/DicomImageDecoder.h @ 1903:554ec8422ec5

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 05 Jan 2016 13:58:13 +0100
parents 8b0ee8d5e6d0
children 8b1baa2315b8
comparison
equal deleted inserted replaced
1902:8b0ee8d5e6d0 1903:554ec8422ec5
47 47
48 DicomImageDecoder() // This is a fully abstract class, no constructor 48 DicomImageDecoder() // This is a fully abstract class, no constructor
49 { 49 {
50 } 50 }
51 51
52 static ImageAccessor* DecodeUncompressedImageInternal(DcmDataset& dataset,
53 unsigned int frame);
54
55 static bool IsPsmctRle1(DcmDataset& dataset);
56
57 static ImageAccessor* CreateImage(DcmDataset& dataset);
58
59 static bool IsUncompressedImage(const DcmDataset& dataset);
60
61 static ImageAccessor* DecodeUncompressedImage(DcmDataset& dataset, 52 static ImageAccessor* DecodeUncompressedImage(DcmDataset& dataset,
62 unsigned int frame); 53 unsigned int frame);
63 54
64 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 55 static bool IsPsmctRle1(DcmDataset& dataset);
65 static ImageAccessor* DecodeJpegLossless(DcmDataset& dataset,
66 unsigned int frame);
67 #endif
68 56
69 static bool TruncateDecodedImage(std::auto_ptr<ImageAccessor>& image, 57 static bool TruncateDecodedImage(std::auto_ptr<ImageAccessor>& image,
70 PixelFormat format, 58 PixelFormat format,
71 bool allowColorConversion); 59 bool allowColorConversion);
72 60
74 62
75 static void ApplyExtractionMode(std::auto_ptr<ImageAccessor>& image, 63 static void ApplyExtractionMode(std::auto_ptr<ImageAccessor>& image,
76 ImageExtractionMode mode); 64 ImageExtractionMode mode);
77 65
78 public: 66 public:
67 static ImageAccessor* CreateImage(DcmDataset& dataset);
68
79 static ImageAccessor *Decode(ParsedDicomFile& dicom, 69 static ImageAccessor *Decode(ParsedDicomFile& dicom,
80 unsigned int frame); 70 unsigned int frame);
81 71
82 static void ExtractPngImage(std::string& result, 72 static void ExtractPngImage(std::string& result,
83 std::auto_ptr<ImageAccessor>& image, 73 std::auto_ptr<ImageAccessor>& image,