Mercurial > hg > orthanc
diff Core/Images/Font.h @ 4032:058b5ade8acd
renaming embedded resources
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 09 Jun 2020 21:43:42 +0200 |
parents | 100fbe970762 |
children |
line wrap: on
line diff
--- a/Core/Images/Font.h Tue Jun 09 21:31:13 2020 +0200 +++ b/Core/Images/Font.h Tue Jun 09 21:43:42 2020 +0200 @@ -33,17 +33,8 @@ #pragma once -// To have ORTHANC_HAS_EMBEDDED_RESOURCES defined if using the shared library #include "../OrthancFramework.h" -#if !defined(ORTHANC_HAS_EMBEDDED_RESOURCES) -# error Macro ORTHANC_HAS_EMBEDDED_RESOURCES must be defined -#endif - -#if ORTHANC_HAS_EMBEDDED_RESOURCES == 1 -# include <OrthancEmbeddedResources.h> // Autogenerated file -#endif - #include "ImageAccessor.h" #include <stdint.h> @@ -99,10 +90,6 @@ 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_;