Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 4032:058b5ade8acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renaming embedded resources
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 21:43:42 +0200
parents 100fbe970762
children
comparison
equal deleted inserted replaced
4031:e3b3af80732d 4032:058b5ade8acd
101 # include <dcmtk/dcmdata/dcvruc.h> 101 # include <dcmtk/dcmdata/dcvruc.h>
102 # include <dcmtk/dcmdata/dcvrur.h> 102 # include <dcmtk/dcmdata/dcvrur.h>
103 #endif 103 #endif
104 104
105 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 105 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
106 # include <OrthancEmbeddedResources.h> 106 # include <OrthancFrameworkResources.h>
107 #endif 107 #endif
108 108
109 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 109 #if ORTHANC_ENABLE_DCMTK_JPEG == 1
110 # include <dcmtk/dcmjpeg/djdecode.h> 110 # include <dcmtk/dcmjpeg/djdecode.h>
111 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1 111 # if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
140 } 140 }
141 141
142 142
143 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 143 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
144 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary, 144 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary,
145 EmbeddedResources::FileResourceId resource) 145 FrameworkResources::FileResourceId resource)
146 { 146 {
147 std::string content; 147 std::string content;
148 EmbeddedResources::GetFileResource(content, resource); 148 FrameworkResources::GetFileResource(content, resource);
149 149
150 #if ORTHANC_SANDBOXED == 0 150 #if ORTHANC_SANDBOXED == 0
151 TemporaryFile tmp; 151 TemporaryFile tmp;
152 tmp.Write(content); 152 tmp.Write(content);
153 153
267 /** 267 /**
268 * Do not load DICONDE dictionary, it breaks the other tags. The 268 * Do not load DICONDE dictionary, it breaks the other tags. The
269 * command "strace storescu 2>&1 |grep dic" shows that DICONDE 269 * command "strace storescu 2>&1 |grep dic" shows that DICONDE
270 * dictionary is not loaded by storescu. 270 * dictionary is not loaded by storescu.
271 **/ 271 **/
272 //LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICONDE); 272 //LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICONDE);
273 273
274 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM); 274 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_DICOM);
275 275
276 if (loadPrivateDictionary) 276 if (loadPrivateDictionary)
277 { 277 {
278 LOG(INFO) << "Loading the embedded dictionary of private tags"; 278 LOG(INFO) << "Loading the embedded dictionary of private tags";
279 LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE); 279 LoadEmbeddedDictionary(*locker, FrameworkResources::DICTIONARY_PRIVATE);
280 } 280 }
281 else 281 else
282 { 282 {
283 LOG(INFO) << "The dictionary of private tags has not been loaded"; 283 LOG(INFO) << "The dictionary of private tags has not been loaded";
284 } 284 }