Mercurial > hg > orthanc-wsi
comparison Framework/Orthanc/Core/Images/JpegReader.cpp @ 54:06847108819c
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 24 Nov 2016 12:59:50 +0100 |
parents | 9621fd6f17c9 |
children |
comparison
equal
deleted
inserted
replaced
53:175d06fa292e | 54:06847108819c |
---|---|
34 #include "JpegReader.h" | 34 #include "JpegReader.h" |
35 | 35 |
36 #include "JpegErrorManager.h" | 36 #include "JpegErrorManager.h" |
37 #include "../OrthancException.h" | 37 #include "../OrthancException.h" |
38 #include "../Logging.h" | 38 #include "../Logging.h" |
39 #include "../SystemToolbox.h" | 39 |
40 #if ORTHANC_SANDBOXED == 0 | |
41 # include "../SystemToolbox.h" | |
42 #endif | |
43 | |
40 | 44 |
41 namespace Orthanc | 45 namespace Orthanc |
42 { | 46 { |
43 static void Uncompress(struct jpeg_decompress_struct& cinfo, | 47 static void Uncompress(struct jpeg_decompress_struct& cinfo, |
44 std::string& content, | 48 std::string& content, |
92 | 96 |
93 jpeg_finish_decompress(&cinfo); | 97 jpeg_finish_decompress(&cinfo); |
94 } | 98 } |
95 | 99 |
96 | 100 |
101 #if ORTHANC_SANDBOXED == 0 | |
97 void JpegReader::ReadFromFile(const std::string& filename) | 102 void JpegReader::ReadFromFile(const std::string& filename) |
98 { | 103 { |
99 FILE* fp = SystemToolbox::OpenFile(filename, FileMode_ReadBinary); | 104 FILE* fp = SystemToolbox::OpenFile(filename, FileMode_ReadBinary); |
100 if (!fp) | 105 if (!fp) |
101 { | 106 { |
133 } | 138 } |
134 | 139 |
135 jpeg_destroy_decompress(&cinfo); | 140 jpeg_destroy_decompress(&cinfo); |
136 fclose(fp); | 141 fclose(fp); |
137 } | 142 } |
143 #endif | |
138 | 144 |
139 | 145 |
140 void JpegReader::ReadFromMemory(const void* buffer, | 146 void JpegReader::ReadFromMemory(const void* buffer, |
141 size_t size) | 147 size_t size) |
142 { | 148 { |