Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.h @ 3691:4922bdd046dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Feb 2020 21:44:09 +0100
parents 46cb00e4adbb
children 090022f1b5e1
comparison
equal deleted inserted replaced
3690:a9ce35d67c3c 3691:4922bdd046dd
207 207
208 static ValueRepresentation Convert(DcmEVR vr); 208 static ValueRepresentation Convert(DcmEVR vr);
209 209
210 static ValueRepresentation LookupValueRepresentation(const DicomTag& tag); 210 static ValueRepresentation LookupValueRepresentation(const DicomTag& tag);
211 211
212 static DcmElement* CreateElementForTag(const DicomTag& tag); 212 static DcmElement* CreateElementForTag(const DicomTag& tag,
213 const std::string& privateCreator);
213 214
214 static void FillElementWithString(DcmElement& element, 215 static void FillElementWithString(DcmElement& element,
215 const DicomTag& tag,
216 const std::string& utf8alue, // Encoded using UTF-8 216 const std::string& utf8alue, // Encoded using UTF-8
217 bool decodeDataUriScheme, 217 bool decodeDataUriScheme,
218 Encoding dicomEncoding); 218 Encoding dicomEncoding);
219 219
220 static DcmElement* FromJson(const DicomTag& tag, 220 static DcmElement* FromJson(const DicomTag& tag,
221 const Json::Value& element, // Encoded using UTF-8 221 const Json::Value& element, // Encoded using UTF-8
222 bool decodeDataUriScheme, 222 bool decodeDataUriScheme,
223 Encoding dicomEncoding); 223 Encoding dicomEncoding,
224 const std::string& privateCreator);
224 225
225 static DcmPixelSequence* GetPixelSequence(DcmDataset& dataset); 226 static DcmPixelSequence* GetPixelSequence(DcmDataset& dataset);
226 227
227 static Encoding ExtractEncoding(const Json::Value& json, 228 static Encoding ExtractEncoding(const Json::Value& json,
228 Encoding defaultEncoding); 229 Encoding defaultEncoding);
229 230
230 static DcmDataset* FromJson(const Json::Value& json, // Encoded using UTF-8 231 static DcmDataset* FromJson(const Json::Value& json, // Encoded using UTF-8
231 bool generateIdentifiers, 232 bool generateIdentifiers,
232 bool decodeDataUriScheme, 233 bool decodeDataUriScheme,
233 Encoding defaultEncoding); 234 Encoding defaultEncoding,
235 const std::string& privateCreator);
234 236
235 static DcmFileFormat* LoadFromMemoryBuffer(const void* buffer, 237 static DcmFileFormat* LoadFromMemoryBuffer(const void* buffer,
236 size_t size); 238 size_t size);
237 239
238 static void FromJson(DicomMap& values, 240 static void FromJson(DicomMap& values,