Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
4035:cc6ed76bba27 4036:c6e82885f570
35 35
36 #include "../Core/Images/FontRegistry.h" 36 #include "../Core/Images/FontRegistry.h"
37 #include "../Core/WebServiceParameters.h" 37 #include "../Core/WebServiceParameters.h"
38 #include "../Core/DicomNetworking/RemoteModalityParameters.h" 38 #include "../Core/DicomNetworking/RemoteModalityParameters.h"
39 39
40 #include <EmbeddedResources.h> 40 #include <OrthancServerResources.h>
41 41
42 #include <boost/filesystem.hpp> 42 #include <boost/filesystem.hpp>
43 #include <boost/thread/shared_mutex.hpp> 43 #include <boost/thread/shared_mutex.hpp>
44 #include <boost/thread/lock_types.hpp> 44 #include <boost/thread/lock_types.hpp>
45 45
156 156
157 void Read(const char* configurationFile); 157 void Read(const char* configurationFile);
158 158
159 void LoadModalitiesAndPeers(); 159 void LoadModalitiesAndPeers();
160 160
161 void RegisterFont(EmbeddedResources::FileResourceId resource) 161 void RegisterFont(ServerResources::FileResourceId resource);
162 {
163 fontRegistry_.AddFromResource(resource);
164 }
165 162
166 bool LookupStringParameter(std::string& target, 163 bool LookupStringParameter(std::string& target,
167 const std::string& parameter) const; 164 const std::string& parameter) const;
168 165
169 std::string GetStringParameter(const std::string& parameter, 166 std::string GetStringParameter(const std::string& parameter,