X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestFileAccessors.cxx;h=6e321a2585c15fd1d09440482a18afbbc4fd325f;hb=8da7d3725f3b22fb88fbe544d0bb49ec62d7bf9c;hp=ff1ea02b56c25caff1782a85139d8b313976e619;hpb=eacd2efd90ffb9015d6358f135cb17a838a29abb;p=gdcm.git

diff --git a/Testing/TestFileAccessors.cxx b/Testing/TestFileAccessors.cxx
index ff1ea02b..6e321a25 100644
--- 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/20 08:58:15 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/11/28 11:54:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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; \
    }
 
@@ -58,12 +58,18 @@ int TestFileAccessors(int, char *[])
 
    while( gdcmDataImages[i] != 0 )
    {
+   
+      if (gdcmDataImages[i] == "00191113.dcm" )
+         gdcm::Debug::DebugOn();
+      else
+         gdcm::Debug::DebugOff();
+
       std::string filename = GDCM_DATA_ROOT;
       filename += "/";  //doh!
       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( );
 
@@ -119,7 +125,7 @@ int TestFileAccessors(int, char *[])
       {
          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 +134,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++;
    }