X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=7f62c0b7019c9cfccc6a98998d0596b77baa74de;hb=f8be63ebb26fa8fc3381c4ac129138fabf229412;hp=51007bbd89237c84f336e6fc4b153ea3548b6bec;hpb=d7625b1d78115d3d2e8dc1d2dd4169820eaf2639;p=gdcm.git

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index 51007bbd..7f62c0b7 100644
--- 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/06 09:53:43 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/10/25 14:52:31 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,24 +22,27 @@
 //Generated file:
 #include "gdcmDataImages.h"
  
-int CompareInternal(std::string const & filename, std::string const & output)
+int CompareInternal(std::string const &filename, std::string const &output)
 {
    std::cout << "   Testing: " << filename << std::endl;
 
    //////////////// Step 1 (see above description):
 
-   gdcm::File *file = new gdcm::File( filename );
+   gdcm::File *file = gdcm::File::New( );
+   file->SetFileName( filename );
+   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;
+      file->Delete();
       return 1;
    }
    std::cout << "           step 1...";
 
    //////////////// Step 2:
-   gdcm::FileHelper *filehelper = new gdcm::FileHelper( file );
+   gdcm::FileHelper *filehelper = gdcm::FileHelper::New( file );
    int dataSize    = filehelper->GetImageDataSize();
    uint8_t *imageData = filehelper->GetImageData(); //EXTREMELY IMPORTANT
           // Sure, it is : It's up to the user to decide if he wants to
@@ -53,17 +56,24 @@ int CompareInternal(std::string const & filename, std::string const & output)
    std::cout << "2...";
  
    //////////////// Step 3:
-   gdcm::FileHelper *reread = new gdcm::FileHelper( output );
-   if( !reread->GetFile()->IsReadable() )
+   gdcm::File *fileout = gdcm::File::New();
+   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 reread image "
-               << "written:" << filename << std::endl;
-     delete file;
-     delete filehelper;
-     delete reread;
-     return 1;
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Could not parse the newly "
+                << "written image:" << filename << std::endl;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      return 1;
    }
+
+   gdcm::FileHelper *reread = gdcm::FileHelper::New( fileout );
+
    std::cout << "3...";
    // For the next step:
    int    dataSizeWritten = reread->GetImageDataSize();
@@ -83,9 +93,10 @@ int CompareInternal(std::string const & filename, std::string const & output)
                   << reread->GetFile()->GetYSize() << " | "
          << "Z: " << file->GetZSize() << " # " 
                   << reread->GetFile()->GetZSize() << std::endl;
-      delete file;
-      delete filehelper;
-      delete reread;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
       return 1;
    }
 
@@ -95,9 +106,10 @@ int CompareInternal(std::string const & filename, std::string const & output)
       std::cout << "Failed" << std::endl
          << "        Pixel areas lengths differ: "
          << dataSize << " # " << dataSizeWritten << std::endl;
-      delete file;
-      delete filehelper;
-      delete reread;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
       return 1;
    }
 
@@ -106,17 +118,19 @@ int CompareInternal(std::string const & filename, std::string const & output)
    {
       std::cout << "Failed" << std::endl
          << "        Pixel differ (as expanded in memory)." << std::endl;
-      delete file;
-      delete filehelper;
-      delete reread;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
       return 1;
    }
    std::cout << "4...OK." << std::endl ;
 
    //////////////// Clean up:
-   delete file;
-   delete filehelper;
-   delete reread;
+   file->Delete();
+   filehelper->Delete();
+   fileout->Delete();
+   reread->Delete();
 
    return 0;
 }
@@ -136,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
    {