Mercurial > hg > orthanc
comparison Core/Images/FontRegistry.cpp @ 2379:4900688827a8
reorganization in CMake
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 28 Aug 2017 18:07:03 +0200 |
parents | a3a65de1840f |
children | 5edec967055e |
comparison
equal
deleted
inserted
replaced
2378:116ade1eff82 | 2379:4900688827a8 |
---|---|
63 f->LoadFromFile(path); | 63 f->LoadFromFile(path); |
64 fonts_.push_back(f.release()); | 64 fonts_.push_back(f.release()); |
65 } | 65 } |
66 | 66 |
67 | 67 |
68 #if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 | |
68 void FontRegistry::AddFromResource(EmbeddedResources::FileResourceId resource) | 69 void FontRegistry::AddFromResource(EmbeddedResources::FileResourceId resource) |
69 { | 70 { |
70 std::string content; | 71 std::string content; |
71 EmbeddedResources::GetFileResource(content, resource); | 72 EmbeddedResources::GetFileResource(content, resource); |
72 AddFromMemory(content); | 73 AddFromMemory(content); |
73 } | 74 } |
75 #endif | |
74 | 76 |
75 | 77 |
76 const Font& FontRegistry::GetFont(size_t i) const | 78 const Font& FontRegistry::GetFont(size_t i) const |
77 { | 79 { |
78 if (i >= fonts_.size()) | 80 if (i >= fonts_.size()) |