Modify TestValidate to compile with New() vs new

[gdcm.git] / Testing / TestFileAccessors.cxx

diff --git a/Testing/TestFileAccessors.cxx b/Testing/TestFileAccessors.cxx
index a6251ca5327d3c25ba3ac946ae66bee690be40ea..3ace1920d4b89f6ddb3adcaf8d7feef3b6e60629 100644 (file)
--- a/Testing/TestFileAccessors.cxx
+++ b/Testing/TestFileAccessors.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestFileAccessors.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/18 08:35:46 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/10/25 14:52:31 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,7 +45,7 @@
    catch(...) \
    { \
       std::cout << "   --> Can't access to the '" << #name << "' method !" << std::endl; \
-      delete f; \
+      f->Delete(); \
       return 1; \
    }
 
@@ -63,7 +63,7 @@ int TestFileAccessors(int, char *[])
       filename += gdcmDataImages[i];
       
       std::cout << "Begin with " << filename << std::endl;
-      gdcm::File *f= new gdcm::File( );
+      gdcm::File *f= gdcm::File::New( );
       f->SetFileName( filename );
       f->Load( );
 
@@ -111,15 +111,15 @@ int TestFileAccessors(int, char *[])
       TestMethodMacro(std::dec,f,GetFileName)
 
       f->GetImageOrientationPatient( iop );
+      std::cout << "   Orientation:" << std::endl;
       for (int j=0; j<6; j++)
-         std::cout << "iop[" << j << "] = " << iop[j] << std::endl;
+         std::cout << "      iop[" << j << "] = " << iop[j] << std::endl;
 
       if( f->IsReadable() )
       {
-         std::cout <<filename   << " is Readable" 
-                   << std::endl << std::endl;
+         std::cout << "   " << filename << " is Readable" << std::endl;
 
-         gdcm::FileHelper *fh= new gdcm::FileHelper( f );   
+         gdcm::FileHelper *fh= gdcm::FileHelper::New( f );   
 
          TestMethodMacro(std::dec,fh,GetImageDataSize)
          TestMethodMacro(std::dec,fh,GetImageDataRawSize)
@@ -128,17 +128,17 @@ int TestFileAccessors(int, char *[])
          TestMethodMacro(std::dec,fh,GetUserDataSize)
          TestMethodMacro(std::dec,fh,GetWriteType)
  
-         delete fh;
+         fh->Delete();
       }
       else
       {
          std::cout << filename << " is NOT Readable" 
                    << std::endl << std::endl;
-         delete f;
+         f->Delete();
          return 1;
       }
 
-      delete f;
+      f->Delete();
       std::cout << "End with " << filename << std::endl;
       i++;
    }