Speed up -a little bit- the Loading, avoiding to parse any Sequence, not only

[gdcm.git] / Testing / TestReadWriteReadCompare.cxx

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index cadead8a8986d8a576ed40a9ee380f561f5e79a7..2fe46dee09ae2c02199e417fac110c0f83f1e645 100644 (file)
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/21 04:51:26 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/10/19 13:15:37 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,8 @@ int CompareInternal(std::string const &filename, std::string const &output)
    file->Load ();
    if( !file->IsReadable() )
    {
-      std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
                 << filename << std::endl;
       delete file;
       return 1;
@@ -59,15 +60,16 @@ int CompareInternal(std::string const &filename, std::string const &output)
    fileout->SetFileName( output );
    fileout->Load();
   // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated
-  
+
    if( !fileout->IsReadable() )
    {
-     std::cerr << "Failed" << std::endl
-               << "Test::TestReadWriteReadCompare: Could not parse the newly "
-               << "written image:" << filename << std::endl;
-     delete file;
-     delete filehelper;
-     return 1;
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Could not parse the newly "
+                << "written image:" << filename << std::endl;
+      delete file;
+      delete filehelper;
+      delete fileout;
+      return 1;
    }
 
    gdcm::FileHelper *reread = new gdcm::FileHelper( fileout );
@@ -93,6 +95,7 @@ int CompareInternal(std::string const &filename, std::string const &output)
                   << reread->GetFile()->GetZSize() << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -105,6 +108,7 @@ int CompareInternal(std::string const &filename, std::string const &output)
          << dataSize << " # " << dataSizeWritten << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -116,6 +120,7 @@ int CompareInternal(std::string const &filename, std::string const &output)
          << "        Pixel differ (as expanded in memory)." << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -124,6 +129,7 @@ int CompareInternal(std::string const &filename, std::string const &output)
    //////////////// Clean up:
    delete file;
    delete filehelper;
+   delete fileout;
    delete reread;
 
    return 0;
@@ -144,7 +150,7 @@ int TestReadWriteReadCompare(int argc, char *argv[])
    }
    else if( argc > 4 || argc == 2 )
    {
-      std::cerr << "Please read the manual" << std::endl;
+      std::cout << "Please read the manual" << std::endl;
    }
    else
    {