X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestFileAccessors.cxx;h=3ace1920d4b89f6ddb3adcaf8d7feef3b6e60629;hb=7e67e246cf5b7e08d57f6ca1dee617d36d3f8dc5;hp=ff1ea02b56c25caff1782a85139d8b313976e619;hpb=eacd2efd90ffb9015d6358f135cb17a838a29abb;p=gdcm.git diff --git a/Testing/TestFileAccessors.cxx b/Testing/TestFileAccessors.cxx index ff1ea02b..3ace1920 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/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( ); @@ -119,7 +119,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 +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++; }