* Testing/TestWriteSimple.cxx, TestSequence.cxx : fix memroy leaks

   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index e106decc974458df629c84699d9e273c78c666d1..b8104c1154fb01051add779a9c53bed1b53edcda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-02-10 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * Testing/TestWriteSimple.cxx, TestSequence.cxx : fix memroy leaks
+
 2005-02-09 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/gdcmFileHelper.[h|cxx] : now correctly set the VR of the datas when 
      writting the file

diff --git a/Testing/TestSequence.cxx b/Testing/TestSequence.cxx
index 838d5e708a87a7c863a9211dfbecfd929907e698..253819989325ce6ad0091bfa44e2929dc4512b87 100644 (file)
--- a/Testing/TestSequence.cxx
+++ b/Testing/TestSequence.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestSequence.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/07 12:53:59 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -173,6 +173,7 @@ gdcm::File *WriteImage(gdcm::File *file,const std::string &fileName)
 
    size_t size = 256 * 256 * 1;
    unsigned char *imageData = new unsigned char[size];
+   memset(imageData,0,size);
 
 // Write the image
    gdcm::FileHelper *hlp = new gdcm::FileHelper(file);
@@ -321,7 +322,7 @@ int TestSequence(int argc, char *argv[])
    }
    ClearList(fileList);
 
-   std::cout<<"3...OK";
+   std::cout<<"3...OK\n";
 
    return 0;
 }

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 9e23c936372b32bc5c4edad6200bb342648d1d44..19b216bc1e901c5a116bcfcd7584bb821cda2da5 100644 (file)
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/10 10:51:39 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -181,7 +181,7 @@ int WriteSimple(Image &img)
                {
                   *(tmp+1) = j/256;
                }
-               tmp += img.components/8;
+               tmp += img.componentSize/8;
             }
          }
       }
@@ -286,9 +286,8 @@ int WriteSimple(Image &img)
    }
 
    // Test the data's content
-   if (int res = memcmp(imageData, imageDataWritten, size) !=0)
+   if ( memcmp(imageData, imageDataWritten, size) !=0 )
    {
-      (void)res;
       std::cout << "Failed" << std::endl
                 << "        Pixel differ (as expanded in memory)." << std::endl;
       delete fileToBuild;

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 6394cd427f4d6b5a094ccd277c12a6739a5a3257..d17fe6ae255c23439f3c685368cec0c5fa0a39ae 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/05 04:28:38 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ BinEntry::BinEntry(DocEntry *e)
 {
    Copy(e);
 
-   BinArea = 0; // let's be carefull !
+   BinArea = 0;
    SelfArea = true;
 }
 

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index d4a62bb48543c7c2c4543cdc611f8d1c052a0044..d3520ac40cf635f4b1fb682916f0d473eb874f47 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/10 10:55:26 $
-  Version:   $Revision: 1.221 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.222 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -367,7 +367,8 @@ int File::GetZSize()
   */
 float File::GetXSpacing()
 {
-   float xspacing, yspacing;
+   float xspacing = 1.0;
+   float yspacing = 1.0;
    const std::string &strSpacing = GetEntryValue(0x0028,0x0030);
 
    if( strSpacing == GDCM_UNFOUND )