* Fix a few delete/delete[] mismatch

diff --git a/ChangeLog b/ChangeLog
index 700664117aa92345056652f5656045e2f22ca2a3..6a3e95ad200b2a2e7648b83988c75b5f352cb605 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2003-09-09  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * Fix a few delete/delete[] mismatch
 2003-09-08  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
       * src/gdcmHeaderHelper.[h cxx]: added new class that provide an
       interpretation to data given by gdcmHeader. For instance there are

diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 41d85d0ee01d70fdb9966242f3b0c97114efa010..cb32855dc1c67997fe0a28ecec98fe51e4f2510a 100644 (file)
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.cxx,v 1.1 2003/09/08 16:37:47 malaterre Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.cxx,v 1.2 2003/09/09 08:46:32 malaterre Exp $
 
 //This is needed when compiling in debug mode
 #ifdef _MSC_VER
@@ -571,7 +571,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering()
     
       if( dist == 0 )
       {
-        delete cosines;
+        delete[] cosines;
         return false;
       }
 
@@ -591,7 +591,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering()
 
       if( dist == 0 )
       {
-        delete cosines;
+        delete[] cosines;
         return false;
       }
 
@@ -688,11 +688,10 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering()
         it3 != CoherentGdcmFileVector.end(); it3++)
   {
     CoherentGdcmFileList.push_back( *it3 );
-    std::cout << (*it3)->GetImageNumber() << std::endl;
   }
   CoherentGdcmFileVector.clear();
   
-  delete partition;
+  delete[] partition;
   return mult;
 }
 //----------------------------------------------------------------------------

diff --git a/src/gdcmHeaderHelper.h b/src/gdcmHeaderHelper.h
index 6fb9e2d478d97d6e745a7e3b1853680b0801cb78..a0fc9494c60ff33e3b7245db1de8713051d0605e 100644 (file)
--- a/src/gdcmHeaderHelper.h
+++ b/src/gdcmHeaderHelper.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.h,v 1.1 2003/09/08 16:37:47 malaterre Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.h,v 1.2 2003/09/09 08:46:32 malaterre Exp $
 
 #ifndef GDCMHEADERHELPER_H
 #define GDCMHEADERHELPER_H
@@ -19,7 +19,7 @@
       XA };
       
 /**
-  This class is meant to *interprate* data given from gdcmHeader
+  This class is meant to *interpret* data given from gdcmHeader
   That is to say :
    * it will help other dev to link against there lib
    * return value instead of string
@@ -34,7 +34,6 @@ public:
    gdcmHeaderHelper::gdcmHeaderHelper();
    gdcmHeaderHelper::gdcmHeaderHelper(const char *filename, bool exception_on_error = false);
 
-    //Ces fonction releve de l'interpretation des données de gdcmHeader
    int GetPixelSize();
    std::string GetPixelType();