Mercurial > hg > orthanc

comparison OrthancServer/Internals/DicomImageDecoder.h @ 2380:96b3ec054b69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganization in macros
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 16:49:44 +0200
parents e002430baa41
children
comparison
equal deleted inserted replaced
2379:4900688827a8 2380:96b3ec054b69
39 39
40 #if !defined(ORTHANC_ENABLE_JPEG) 40 #if !defined(ORTHANC_ENABLE_JPEG)
41 # error The macro ORTHANC_ENABLE_JPEG must be defined 41 # error The macro ORTHANC_ENABLE_JPEG must be defined
42 #endif 42 #endif
43 43
44 #if !defined(ORTHANC_ENABLE_JPEG_LOSSLESS) 44 #if !defined(ORTHANC_ENABLE_PNG)
45 # error The macro ORTHANC_ENABLE_JPEG_LOSSLESS must be defined 45 # error The macro ORTHANC_ENABLE_PNG must be defined
46 #endif
47
48 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG)
49 # error The macro ORTHANC_ENABLE_DCMTK_JPEG must be defined
50 #endif
51
52 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS)
53 # error The macro ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS must be defined
46 #endif 54 #endif
47 55
48 56
49 class DcmDataset; 57 class DcmDataset;
50 class DcmCodec; 58 class DcmCodec;
89 DcmDataset& dataset); 97 DcmDataset& dataset);
90 98
91 static ImageAccessor *Decode(ParsedDicomFile& dicom, 99 static ImageAccessor *Decode(ParsedDicomFile& dicom,
92 unsigned int frame); 100 unsigned int frame);
93 101
102 #if ORTHANC_ENABLE_PNG == 1
94 static void ExtractPngImage(std::string& result, 103 static void ExtractPngImage(std::string& result,
95 std::auto_ptr<ImageAccessor>& image, 104 std::auto_ptr<ImageAccessor>& image,
96 ImageExtractionMode mode, 105 ImageExtractionMode mode,
97 bool invert); 106 bool invert);
107 #endif
98 108
109 #if ORTHANC_ENABLE_JPEG == 1
99 static void ExtractJpegImage(std::string& result, 110 static void ExtractJpegImage(std::string& result,
100 std::auto_ptr<ImageAccessor>& image, 111 std::auto_ptr<ImageAccessor>& image,
101 ImageExtractionMode mode, 112 ImageExtractionMode mode,
102 bool invert, 113 bool invert,
103 uint8_t quality); 114 uint8_t quality);
115 #endif
104 }; 116 };
105 } 117 }