Mercurial > hg > orthanc
comparison Core/Images/JpegReader.cpp @ 2017:08ce34cfacad
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 13 Jun 2016 15:49:10 +0200 |
parents | 56276bad7e42 |
children | 5d4743fd8a85 |
comparison
equal
deleted
inserted
replaced
2016:0ae26237569a | 2017:08ce34cfacad |
---|---|
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 "../Toolbox.h" | |
39 | 40 |
40 namespace Orthanc | 41 namespace Orthanc |
41 { | 42 { |
42 static void Uncompress(struct jpeg_decompress_struct& cinfo, | 43 static void Uncompress(struct jpeg_decompress_struct& cinfo, |
43 std::string& content, | 44 std::string& content, |
93 } | 94 } |
94 | 95 |
95 | 96 |
96 void JpegReader::ReadFromFile(const std::string& filename) | 97 void JpegReader::ReadFromFile(const std::string& filename) |
97 { | 98 { |
98 FILE* fp = fopen(filename.c_str(), "rb"); | 99 FILE* fp = Toolbox::OpenFile(filename, FileMode_ReadBinary); |
99 if (!fp) | 100 if (!fp) |
100 { | 101 { |
101 throw OrthancException(ErrorCode_InexistentFile); | 102 throw OrthancException(ErrorCode_InexistentFile); |
102 } | 103 } |
103 | 104 |