Program: gdcm
Module: $RCSfile: PatchHeader.cxx,v $
Language: C++
- Date: $Date: 2005/08/30 14:40:28 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2006/01/26 15:52:42 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return 0;
}
- char *fileName = am->ArgMgrGetString("filein",(char *)0);
- char *dirName = am->ArgMgrGetString("dirin",(char *)0);
+ const char *fileName = am->ArgMgrGetString("filein");
+ const char *dirName = am->ArgMgrGetString("dirin");
if ( (fileName == 0 && dirName == 0)
||
if (am->ArgMgrDefined("debug"))
gdcm::Debug::DebugOn();
- int loadMode = GDCM_LD_ALL;
+ int loadMode = gdcm::LD_ALL;
if ( am->ArgMgrDefined("noshadowseq") )
- loadMode |= GDCM_LD_NOSHADOWSEQ;
+ loadMode |= gdcm::LD_NOSHADOWSEQ;
else
{
- if ( am->ArgMgrDefined("noshadow") )
- loadMode |= GDCM_LD_NOSHADOW;
+ if ( am->ArgMgrDefined("noshadow") )
+ loadMode |= gdcm::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= GDCM_LD_NOSEQ;
+ loadMode |= gdcm::LD_NOSEQ;
}
/* if unused Param we give up */
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();
// not only gdcm::File (as opposed to gdcm::DicomDir)
if ( !res )
{
- std::cout <<std::endl
- << "Sorry, " << fileName <<" not a gdcm-readable "
- << "DICOM / ACR Document"
- << std::endl;
- delete f;
- return 1;
+ std::cout <<std::endl
+ << "Sorry, " << fileName <<" not a gdcm-readable "
+ << "DICOM / ACR Document"
+ << std::endl;
+ f->Delete();
+ return 1;
}
std::cout << fileName << " is readable " << std::endl;
fp->close();
delete fp;
- delete f;
+ f->Delete();
return 0;
}
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;
}
fp->close();
delete fp;
- delete f;
- }
+ f->Delete();
+ }
}
return 0;
}