Mercurial > hg > orthanc

comparison Core/DicomNetworking/DicomUserConnection.cpp @ 3767:c6658187e4b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Mar 2020 14:46:06 +0100
parents 21efa32c8a10
children 3801435e34a1 320a2d224902
comparison
equal deleted inserted replaced
3763:5ff5d5a0fd28 3767:c6658187e4b1
84 84
85 #if !defined(DCMTK_VERSION_NUMBER) 85 #if !defined(DCMTK_VERSION_NUMBER)
86 # error The macro DCMTK_VERSION_NUMBER must be defined 86 # error The macro DCMTK_VERSION_NUMBER must be defined
87 #endif 87 #endif
88 88
89 #include "../Compatibility.h"
89 #include "../DicomFormat/DicomArray.h" 90 #include "../DicomFormat/DicomArray.h"
90 #include "../Logging.h" 91 #include "../Logging.h"
91 #include "../OrthancException.h" 92 #include "../OrthancException.h"
92 #include "../DicomParsing/FromDcmtkBridge.h" 93 #include "../DicomParsing/FromDcmtkBridge.h"
93 #include "../DicomParsing/ToDcmtkBridge.h" 94 #include "../DicomParsing/ToDcmtkBridge.h"
1474 } 1475 }
1475 else 1476 else
1476 { 1477 {
1477 for (size_t i = 0; i < sopClassUids.size(); i++) 1478 for (size_t i = 0; i < sopClassUids.size(); i++)
1478 { 1479 {
1479 std::auto_ptr<DcmItem> item(new DcmItem); 1480 std::unique_ptr<DcmItem> item(new DcmItem);
1480 if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() || 1481 if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() ||
1481 !item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() || 1482 !item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() ||
1482 (hasFailureReasons && 1483 (hasFailureReasons &&
1483 !item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) || 1484 !item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) ||
1484 !dataset.insertSequenceItem(tag, item.release()).good()) 1485 !dataset.insertSequenceItem(tag, item.release()).good())