X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FAnonymizeNoLoad.cxx;h=0eb1da3fb4823b163ed5cecfaf9bc8d38c6a3f38;hb=247c979db58d7bfd1d65029de05f4142a534c4c8;hp=6ffea195f9019c58e35a15ae63d51d1b8ffddb66;hpb=cc819f3c8898bc77a37d0a5c0f938f07071f8c1d;p=gdcm.git diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx index 6ffea195..0eb1da3f 100644 --- a/Example/AnonymizeNoLoad.cxx +++ b/Example/AnonymizeNoLoad.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: AnonymizeNoLoad.cxx,v $ Language: C++ - Date: $Date: 2005/08/28 17:26:31 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/10/25 14:52:26 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -75,15 +75,15 @@ int main(int argc, char *argv[]) return 0; } - int loadMode = 0x00000000; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= NO_SHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= NO_SHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= NO_SEQ; + loadMode |= gdcm::LD_NOSEQ; } int rubOutNb; @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) // // Parse the input file. // - f = new gdcm::File( ); + f = gdcm::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( fileName ); @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) << "Sorry, " << fileName <<" not a gdcm-readable " << "DICOM / ACR Document" << std::endl; - delete f; + f->Delete(); return 1; } std::cout << fileName << " is readable " << std::endl; @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) // f->ClearAnonymizeList(); - delete f; + f->Delete(); return 0; } @@ -192,13 +192,13 @@ int main(int argc, char *argv[]) it != fileList.end(); ++it ) { - f = new gdcm::File( ); + f = gdcm::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); if ( !f->Load() ) { - delete f; + f->Delete(); continue; } // @@ -243,10 +243,9 @@ int main(int argc, char *argv[]) f->ClearAnonymizeList(); - delete f; - } - - } + f->Delete(); + } + } return 0; }