Mercurial > hg > orthanc

comparison Core/Images/FontRegistry.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
55 f->LoadFromMemory(font); 55 f->LoadFromMemory(font);
56 fonts_.push_back(f.release()); 56 fonts_.push_back(f.release());
57 } 57 }
58 58
59 59
60 #if ORTHANC_SANDBOXED == 0
60 void FontRegistry::AddFromFile(const std::string& path) 61 void FontRegistry::AddFromFile(const std::string& path)
61 { 62 {
62 std::auto_ptr<Font> f(new Font); 63 std::auto_ptr<Font> f(new Font);
63 f->LoadFromFile(path); 64 f->LoadFromFile(path);
64 fonts_.push_back(f.release()); 65 fonts_.push_back(f.release());
65 } 66 }
67 #endif
66 68
67 69
68 #if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 70 #if ORTHANC_HAS_EMBEDDED_RESOURCES == 1
69 void FontRegistry::AddFromResource(EmbeddedResources::FileResourceId resource) 71 void FontRegistry::AddFromResource(EmbeddedResources::FileResourceId resource)
70 { 72 {