Program: gdcm
Module: $RCSfile: PatchHeader.cxx,v $
Language: C++
- Date: $Date: 2005/08/28 17:27:00 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:04 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// global variables will be seen inside any function.
-gdcm::File *f;
+GDCM_NAME_SPACE::File *f;
std::fstream *fp;
uint16_t samplesperpixel;
uint16_t highbit;
uint16_t pixelrepresentation;
-bool bsamplesperpixel;
-bool bplanarconfiguration;
-bool bsize;
-bool brows;
-bool bcolumns;
-bool bplanes;
-bool bbitsallocated;
-bool bbitsstored;
-bool bhighbit;
-bool bpixelrepresentation;
+int bsamplesperpixel;
+int bplanarconfiguration;
+int bsize;
+int brows;
+int bcolumns;
+int bplanes;
+int bbitsallocated;
+int bbitsstored;
+int bhighbit;
+int bpixelrepresentation;
void update()
{
uint32_t offset;
- gdcm::DocEntry *d;
+ GDCM_NAME_SPACE::DocEntry *d;
//
// Fields to replace.
//
// ----- Initialize Arguments Manager ------
- gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+ GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (am->ArgMgrDefined("usage") || argc == 1)
{
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)
||
return 0;
}
-bsamplesperpixel = am->ArgMgrDefined("samplesperpixel");
+ bsamplesperpixel = am->ArgMgrDefined("samplesperpixel");
if ( bsamplesperpixel )
samplesperpixel = am->ArgMgrWantInt("samplesperpixel",usage);
pixelrepresentation = am->ArgMgrWantInt("pixelrepresentation",usage);
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
- int loadMode = 0x00000000;
+ int loadMode = GDCM_NAME_SPACE::LD_ALL;
if ( am->ArgMgrDefined("noshadowseq") )
- loadMode |= NO_SHADOWSEQ;
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ;
else
{
- if ( am->ArgMgrDefined("noshadow") )
- loadMode |= NO_SHADOW;
+ if ( am->ArgMgrDefined("noshadow") )
+ loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW;
if ( am->ArgMgrDefined("noseq") )
- loadMode |= NO_SEQ;
+ loadMode |= GDCM_NAME_SPACE::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_NAME_SPACE::File::New( );
f->SetLoadMode(loadMode);
f->SetFileName( fileName );
bool res = f->Load();
- // gdcm::File::IsReadable() is no usable here, because we deal with
- // any kind of gdcm::Readable *document*
- // not only gdcm::File (as opposed to gdcm::DicomDir)
+ // GDCM_NAME_SPACE::File::IsReadable() is no usable here, because we deal with
+ // any kind of GDCM_NAME_SPACE::Readable *document*
+ // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::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;
//
// No need to load the pixels in memory.
- // File will be overwritten
+ // File will be overwritten
//
// open the file
fp->close();
delete fp;
- delete f;
+ f->Delete();
return 0;
}
else // ====== Deal with a (single Patient) Directory ======
{
std::cout << "dirName [" << dirName << "]" << std::endl;
- gdcm::DirList dirList(dirName,1); // gets recursively the file list
- gdcm::DirListType fileList = dirList.GetFilenames();
- for( gdcm::DirListType::iterator it = fileList.begin();
+ GDCM_NAME_SPACE::DirList dirList(dirName,1); // gets recursively the file list
+ GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames();
+ for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
- f = new gdcm::File( );
+ f = GDCM_NAME_SPACE::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;
}