Mercurial > hg > orthanc
comparison Core/DicomParsing/ParsedDicomFile.cpp @ 3349:ef18ea68a362
merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 18 Apr 2019 15:52:56 +0200 |
parents | 63f59ad9381a |
children | 3cd94bc66731 |
comparison
equal
deleted
inserted
replaced
3348:a1cd981a0f9a | 3349:ef18ea68a362 |
---|---|
1022 { | 1022 { |
1023 CreateFromDicomMap(map, defaultEncoding, permissive); | 1023 CreateFromDicomMap(map, defaultEncoding, permissive); |
1024 } | 1024 } |
1025 | 1025 |
1026 | 1026 |
1027 ParsedDicomFile::ParsedDicomFile(const DicomMap& map) : | |
1028 pimpl_(new PImpl) | |
1029 { | |
1030 CreateFromDicomMap(map, GetDefaultDicomEncoding(), false /* be strict by default */); | |
1031 } | |
1032 | |
1033 | |
1034 ParsedDicomFile::ParsedDicomFile(const void* content, | 1027 ParsedDicomFile::ParsedDicomFile(const void* content, |
1035 size_t size) : pimpl_(new PImpl) | 1028 size_t size) : pimpl_(new PImpl) |
1036 { | 1029 { |
1037 pimpl_->file_.reset(FromDcmtkBridge::LoadFromMemoryBuffer(content, size)); | 1030 pimpl_->file_.reset(FromDcmtkBridge::LoadFromMemoryBuffer(content, size)); |
1038 } | 1031 } |