Mercurial > hg > orthanc

diff OrthancServer/OrthancConfiguration.h @ 4036:c6e82885f570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Wed, 10 Jun 2020 10:28:15 +0200
parents 058b5ade8acd
children
line wrap: on
line diff
--- a/OrthancServer/OrthancConfiguration.h	Wed Jun 10 10:28:01 2020 +0200
+++ b/OrthancServer/OrthancConfiguration.h	Wed Jun 10 10:28:15 2020 +0200
@@ -37,7 +37,7 @@
 #include "../Core/WebServiceParameters.h"
 #include "../Core/DicomNetworking/RemoteModalityParameters.h"
 
-#include <EmbeddedResources.h>
+#include <OrthancServerResources.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/thread/shared_mutex.hpp>
@@ -158,10 +158,7 @@
 
     void LoadModalitiesAndPeers();
     
-    void RegisterFont(EmbeddedResources::FileResourceId resource)
-    {
-      fontRegistry_.AddFromResource(resource);
-    }
+    void RegisterFont(ServerResources::FileResourceId resource);
 
     bool LookupStringParameter(std::string& target,
                                const std::string& parameter) const;