Mercurial > hg > orthanc
comparison Core/Images/Font.cpp @ 4032:058b5ade8acd
renaming embedded resources
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 09 Jun 2020 21:43:42 +0200 |
parents | 2a170a8f1faf |
children |
comparison
equal
deleted
inserted
replaced
4031:e3b3af80732d | 4032:058b5ade8acd |
---|---|
151 LoadFromMemory(font); | 151 LoadFromMemory(font); |
152 } | 152 } |
153 #endif | 153 #endif |
154 | 154 |
155 | 155 |
156 #if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 | |
157 void Font::LoadFromResource(EmbeddedResources::FileResourceId resource) | |
158 { | |
159 std::string content; | |
160 EmbeddedResources::GetFileResource(content, resource); | |
161 LoadFromMemory(content); | |
162 } | |
163 #endif | |
164 | |
165 | |
166 static unsigned int MyMin(unsigned int a, | 156 static unsigned int MyMin(unsigned int a, |
167 unsigned int b) | 157 unsigned int b) |
168 { | 158 { |
169 return a < b ? a : b; | 159 return a < b ? a : b; |
170 } | 160 } |