Mercurial > hg > orthanc
diff OrthancServer/OrthancInitialization.cpp @ 1610:2dff2bdffdb8
font support within Orthanc
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 04 Sep 2015 13:44:21 +0200 |
parents | f2e3d030ea59 |
children | d3ba98d6b6e9 |
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp Wed Sep 02 15:07:47 2015 +0200 +++ b/OrthancServer/OrthancInitialization.cpp Fri Sep 04 13:44:21 2015 +0200 @@ -75,6 +75,7 @@ static Json::Value configuration_; static boost::filesystem::path defaultDirectory_; static std::string configurationAbsolutePath_; + static FontRegistry fontRegistry_; static std::string GetGlobalStringParameterInternal(const std::string& parameter, @@ -348,6 +349,8 @@ LOG(WARNING) << "Registering JPEG codecs"; DJDecoderRegistration::registerCodecs(); #endif + + fontRegistry_.AddFromResource(EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); } @@ -920,7 +923,6 @@ } - void Configuration::GetConfiguration(Json::Value& result) { boost::mutex::scoped_lock lock(globalMutex_); @@ -936,4 +938,10 @@ Json::StyledWriter w; result = w.write(config); } + + + const FontRegistry& Configuration::GetFontRegistry() + { + return fontRegistry_; + } }