Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomServer.cpp @ 494:012b63028085
CMake parameter for the location of DCMTK dictionaries
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 17 Jul 2013 13:45:28 +0200 |
parents | 16b52fb8d034 |
children | 08eca5d86aad |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomServer.cpp Wed Jul 17 12:48:29 2013 +0200 +++ b/OrthancServer/DicomProtocol/DicomServer.cpp Wed Jul 17 13:45:28 2013 +0200 @@ -82,6 +82,8 @@ boost::filesystem::path p = directory; p = p / filename; + LOG(WARNING) << "Loading the external DICOM dictionary " << p; + if (!dictionary.loadDictionary(p.string().c_str())) { throw OrthancException(ErrorCode_InternalError); @@ -111,7 +113,7 @@ LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_PRIVATE); #elif defined(__linux) - std::string path = "/usr/share/dcmtk"; + std::string path = DCMTK_DICTIONARY_DIR; const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); if (env != NULL)