X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPatchHeader.cxx;h=e88de9161a81fa8211ccae3619e37539b92da934;hb=3d5d93041db5d0e11cef63ea1ec069bb0e65b013;hp=27654339ab8d9965dfd21ee63171c00e3cfd94b6;hpb=f3cc252fad08c3e8dbc395f2ca7cabf47bf95302;p=gdcm.git diff --git a/Example/PatchHeader.cxx b/Example/PatchHeader.cxx index 27654339..e88de916 100644 --- a/Example/PatchHeader.cxx +++ b/Example/PatchHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PatchHeader.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 15:13:05 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/10/25 14:52:27 $ + 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 @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) loadMode |= gdcm::LD_NOSHADOWSEQ; else { - if ( am->ArgMgrDefined("noshadow") ) + if ( am->ArgMgrDefined("noshadow") ) loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) loadMode |= gdcm::LD_NOSEQ; @@ -288,12 +288,10 @@ int main(int argc, char *argv[]) if ( fileName != 0 ) // ====== Deal with a single file ====== { - - // - // Parse the input file. - // - - f = new gdcm::File( ); + // + // Parse the input file. + // + f = gdcm::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( fileName ); bool res = f->Load(); @@ -303,12 +301,12 @@ int main(int argc, char *argv[]) // not only gdcm::File (as opposed to gdcm::DicomDir) if ( !res ) { - std::cout <Delete(); + return 1; } std::cout << fileName << " is readable " << std::endl; @@ -325,7 +323,7 @@ int main(int argc, char *argv[]) fp->close(); delete fp; - delete f; + f->Delete(); return 0; } @@ -338,14 +336,14 @@ 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() ); bool res = f->Load(); if ( !res ) { - delete f; + f->Delete(); continue; } @@ -357,8 +355,8 @@ int main(int argc, char *argv[]) fp->close(); delete fp; - delete f; - } + f->Delete(); + } } return 0; }