瀏覽代碼

COMP: fix build errors if DCMTK is configured to use STL

Marco Nolden 7 年之前
父節點
當前提交
f96b5014aa
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 3 2
      Libs/DICOM/Core/ctkDICOMQuery.cpp
  2. 2 2
      Libs/DICOM/Core/ctkDICOMRetrieve.cpp

+ 3 - 2
Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -46,6 +46,7 @@
 #include <dcmtk/dcmdata/dcdatset.h>
 #include <dcmtk/ofstd/ofcond.h>
 #include <dcmtk/ofstd/ofstring.h>
+#include <dcmtk/ofstd/oflist.h>
 #include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
 #include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
 
@@ -412,7 +413,7 @@ bool ctkDICOMQuery::query(ctkDICOMDatabase& database )
   emit progress(50);
   if (d->Canceled) {return false;}
 
-  for ( OFIterator<QRResponse*> it = responses.begin(); it != responses.end(); it++ )
+  for ( OFListIterator(QRResponse*) it = responses.begin(); it != responses.end(); it++ )
     {
     DcmDataset *dataset = (*it)->m_dataset;
     if ( dataset != NULL ) // the last response is always empty
@@ -463,7 +464,7 @@ bool ctkDICOMQuery::query(ctkDICOMDatabase& database )
     status = d->SCU.sendFINDRequest ( presentationContext, d->Query, &responses );
     if ( status.good() )
       {
-      for ( OFIterator<QRResponse*> it = responses.begin(); it != responses.end(); it++ )
+      for ( OFListIterator(QRResponse*) it = responses.begin(); it != responses.end(); it++ )
         {
         DcmDataset *dataset = (*it)->m_dataset;
         if ( dataset != NULL )

+ 2 - 2
Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -358,7 +358,7 @@ bool ctkDICOMRetrievePrivate::move ( const QString& studyInstanceUID,
       }
     }
     // Select the last MOVE response to output meaningful status information
-    OFIterator<RetrieveResponse*> it = responses.begin();
+    OFListIterator(RetrieveResponse*) it = responses.begin();
   size_t numResults = responses.size();
   for (size_t i = 1; i < numResults; i++)
     {
@@ -479,7 +479,7 @@ bool ctkDICOMRetrievePrivate::get ( const QString& studyInstanceUID,
       }
     }
   // Select the last GET response to output meaningful status information
-  OFIterator<RetrieveResponse*> it = responses.begin();
+  OFListIterator(RetrieveResponse*) it = responses.begin();
   size_t numResults = responses.size();
   for (size_t i = 1; i < numResults; i++)
     {