Mercurial > hg > orthanc

comparison Core/Images/Font.cpp @ 2407:5edec967055e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sandboxed builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Sep 2017 17:02:27 +0200
parents 4900688827a8
children 878b59270859
comparison
equal deleted inserted replaced
2406:f0cfacd0c9b8 2407:5edec967055e
36 36
37 #if !defined(ORTHANC_ENABLE_LOCALE) 37 #if !defined(ORTHANC_ENABLE_LOCALE)
38 # error ORTHANC_ENABLE_LOCALE must be defined to use this file 38 # error ORTHANC_ENABLE_LOCALE must be defined to use this file
39 #endif 39 #endif
40 40
41 #include "../SystemToolbox.h" 41 #if ORTHANC_SANDBOXED == 0
42 # include "../SystemToolbox.h"
43 #endif
44
42 #include "../Toolbox.h" 45 #include "../Toolbox.h"
43 #include "../OrthancException.h" 46 #include "../OrthancException.h"
44 47
45 #include <stdio.h> 48 #include <stdio.h>
46 #include <memory> 49 #include <memory>
136 characters_[static_cast<char>(index)] = c.release(); 139 characters_[static_cast<char>(index)] = c.release();
137 } 140 }
138 } 141 }
139 142
140 143
144 #if ORTHANC_SANDBOXED == 0
141 void Font::LoadFromFile(const std::string& path) 145 void Font::LoadFromFile(const std::string& path)
142 { 146 {
143 std::string font; 147 std::string font;
144 SystemToolbox::ReadFile(font, path); 148 SystemToolbox::ReadFile(font, path);
145 LoadFromMemory(font); 149 LoadFromMemory(font);
146 } 150 }
151 #endif
147 152
148 153
149 static unsigned int MyMin(unsigned int a, 154 static unsigned int MyMin(unsigned int a,
150 unsigned int b) 155 unsigned int b)
151 { 156 {