Fix OFtuple-based compile error in VS 2008/2010.

Try to fix OFtuple-based compile error in VS 2008/2010, and address compiler warning in SunPro Studio 12.6 about possible NULL pointer reference.
AAArdu · Dec 12, 2019 · 8eda253 · 8eda253
1 parent 39e85b5
commit 8eda253
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dcmect/tests/t_huge_concat.cc b/dcmect/tests/t_huge_concat.cc
@@ -430,7 +430,10 @@ static void writeAndCheckConcatenation(EctEnhancedCT* ct, OFList<OFFilename>& co
 static void checkConcatenationInstance(size_t numInstance, EctEnhancedCT* srcInstance, DcmDataset* concatInstance)
 {
     EctEnhancedCT* concat = NULL;
-    OFCHECK(EctEnhancedCT::loadDataset(*concatInstance, concat).good());
+    OFCondition result = EctEnhancedCT::loadDataset(*concatInstance, concat);
+    OFCHECK(result.good());
+    if (result.bad()) return;
+
     Uint32 numFrames;
     numFrames = concat->getNumberOfFrames();
     OFCHECK(numFrames == 1);
@@ -470,7 +473,9 @@ static void checkConcatenationInstance(size_t numInstance, EctEnhancedCT* srcIns
     OFCHECK((srcShared == srcInstance->getFunctionalGroups().getShared()->end())
             && (cShared == concat->getFunctionalGroups().getShared()->end()));
     DcmSequenceOfItems* cPerFrame = NULL;
-    OFCHECK(concatInstance->findAndGetSequence(DCM_PerFrameFunctionalGroupsSequence, cPerFrame).good());
+    result = concatInstance->findAndGetSequence(DCM_PerFrameFunctionalGroupsSequence, cPerFrame);
+    OFCHECK(result.good());
+    if (result.bad()) return;
     OFCHECK(cPerFrame->card() == 1);
 
     OFBool perFrame = OFFalse;

diff --git a/dcmfg/libsrc/concatenationloader.cc b/dcmfg/libsrc/concatenationloader.cc
@@ -145,7 +145,8 @@ void ConcatenationLoader::handleFile(const OFFilename& file, ConcatenationLoader
     }
     if (!err.empty())
     {
-        m_FailedFiles.push_back(OFmake_tuple(file, err, inst.m_sopInstanceUID));
+        OFtuple<OFFilename, OFString, OFString> t(file, err, inst.m_sopInstanceUID);
+        m_FailedFiles.push_back(t);
     }
 }