# HG changeset patch # User Sebastien Jodogne # Date 1540993311 -3600 # Node ID 058851941abe943630f224c8681623ef1c7202a3 # Parent ab03dae59d6e569fa26640c178936935b1cef94c Font::LoadFromResource() diff -r ab03dae59d6e -r 058851941abe Core/Images/Font.cpp --- a/Core/Images/Font.cpp Wed Oct 31 14:14:16 2018 +0100 +++ b/Core/Images/Font.cpp Wed Oct 31 14:41:51 2018 +0100 @@ -153,6 +153,16 @@ #endif +#if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 + void Font::LoadFromResource(EmbeddedResources::FileResourceId resource) + { + std::string content; + EmbeddedResources::GetFileResource(content, resource); + LoadFromMemory(content); + } +#endif + + static unsigned int MyMin(unsigned int a, unsigned int b) { diff -r ab03dae59d6e -r 058851941abe Core/Images/Font.h --- a/Core/Images/Font.h Wed Oct 31 14:14:16 2018 +0100 +++ b/Core/Images/Font.h Wed Oct 31 14:41:51 2018 +0100 @@ -33,6 +33,14 @@ #pragma once +#if !defined(ORTHANC_HAS_EMBEDDED_RESOURCES) +# error Macro ORTHANC_HAS_EMBEDDED_RESOURCES must be defined +#endif + +#if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 +# include // Autogenerated file +#endif + #include "ImageAccessor.h" #include @@ -88,6 +96,10 @@ void LoadFromFile(const std::string& path); #endif +#if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 + void LoadFromResource(EmbeddedResources::FileResourceId resource); +#endif + const std::string& GetName() const { return name_;