Mercurial > hg > orthanc
comparison OrthancServer/Sources/ServerContext.cpp @ 4984:c8cdf5163cd2
cppcheck
author | Alain Mazy <am@osimis.io> |
---|---|
date | Mon, 25 Apr 2022 18:54:45 +0200 |
parents | d0c34145320c |
children | 8fba26292a9f |
comparison
equal
deleted
inserted
replaced
4983:63bf8fb86dae | 4984:c8cdf5163cd2 |
---|---|
2341 if ((expandFlags & ExpandResourceDbFlags_IncludeMainDicomTags) | 2341 if ((expandFlags & ExpandResourceDbFlags_IncludeMainDicomTags) |
2342 && (mainDicomTags.GetSize() > 0) | 2342 && (mainDicomTags.GetSize() > 0) |
2343 && (dicomAsJson != NULL)) | 2343 && (dicomAsJson != NULL)) |
2344 { | 2344 { |
2345 | 2345 |
2346 if (mainDicomTags.GetSize() > 0) | 2346 resource.tags_.Merge(mainDicomTags); |
2347 { | 2347 |
2348 resource.tags_.Merge(mainDicomTags); | 2348 if (dicomAsJson->isObject()) |
2349 } | |
2350 | |
2351 if (dicomAsJson != NULL && dicomAsJson->isObject()) | |
2352 { | 2349 { |
2353 resource.tags_.FromDicomAsJson(*dicomAsJson); | 2350 resource.tags_.FromDicomAsJson(*dicomAsJson); |
2354 } | 2351 } |
2355 | 2352 |
2356 std::set<DicomTag> retrievedTags; | 2353 std::set<DicomTag> retrievedTags; |