comparison Framework/Enumerations.cpp @ 43:9621fd6f17c9

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 17:34:20 +0100
parents 7a88c614be04
children 7a3853d51c45
comparison
equal deleted inserted replaced
42:ee25d35663ac 43:9621fd6f17c9
21 #include "PrecompiledHeadersWSI.h" 21 #include "PrecompiledHeadersWSI.h"
22 #include "Enumerations.h" 22 #include "Enumerations.h"
23 23
24 #include "Jpeg2000Reader.h" 24 #include "Jpeg2000Reader.h"
25 #include "Orthanc/Core/OrthancException.h" 25 #include "Orthanc/Core/OrthancException.h"
26 #include "Orthanc/Core/SystemToolbox.h"
26 #include "Orthanc/Core/Toolbox.h" 27 #include "Orthanc/Core/Toolbox.h"
27 28
28 #include <string.h> 29 #include <string.h>
29 #include <boost/algorithm/string/predicate.hpp> 30 #include <boost/algorithm/string/predicate.hpp>
30 31
80 81
81 82
82 ImageCompression DetectFormatFromFile(const std::string& path) 83 ImageCompression DetectFormatFromFile(const std::string& path)
83 { 84 {
84 std::string header; 85 std::string header;
85 Orthanc::Toolbox::ReadHeader(header, path, 256); 86 Orthanc::SystemToolbox::ReadHeader(header, path, 256);
86 87
87 ImageCompression tmp = DetectFormatFromMemory(header.c_str(), header.size()); 88 ImageCompression tmp = DetectFormatFromMemory(header.c_str(), header.size());
88 if (tmp != ImageCompression_Unknown) 89 if (tmp != ImageCompression_Unknown)
89 { 90 {
90 return tmp; 91 return tmp;