Mercurial > hg > orthanc
comparison Core/DicomFormat/DicomMap.cpp @ 3656:cccd97333e3d storage-commitment
integration mainline->storage-commitment
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 10 Feb 2020 10:37:10 +0100 |
parents | 335611d2b6cd 468181e2f090 |
children | 9dac85e807c2 |
comparison
equal
deleted
inserted
replaced
3652:335611d2b6cd | 3656:cccd97333e3d |
---|---|
1365 if (source.type() != Json::objectValue) | 1365 if (source.type() != Json::objectValue) |
1366 { | 1366 { |
1367 throw OrthancException(ErrorCode_BadFileFormat); | 1367 throw OrthancException(ErrorCode_BadFileFormat); |
1368 } | 1368 } |
1369 | 1369 |
1370 Clear(); | |
1371 | |
1372 std::map<std::string, DicomTag2> mainTags; // TODO - Create a singleton to hold this map | 1370 std::map<std::string, DicomTag2> mainTags; // TODO - Create a singleton to hold this map |
1373 LoadMainDicomTags(mainTags, level); | 1371 LoadMainDicomTags(mainTags, level); |
1374 | 1372 |
1375 Json::Value::Members members = source.getMemberNames(); | 1373 Json::Value::Members members = source.getMemberNames(); |
1376 for (size_t i = 0; i < members.size(); i++) | 1374 for (size_t i = 0; i < members.size(); i++) |