Program: gdcm
Module: $RCSfile: TestFileAccessors.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:46 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2005/11/28 11:54:46 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
catch(...) \
{ \
std::cout << " --> Can't access to the '" << #name << "' method !" << std::endl; \
- delete f; \
+ f->Delete(); \
return 1; \
}
while( gdcmDataImages[i] != 0 )
{
+
+ if (gdcmDataImages[i] == "00191113.dcm" )
+ gdcm::Debug::DebugOn();
+ else
+ gdcm::Debug::DebugOff();
+
std::string filename = GDCM_DATA_ROOT;
filename += "/"; //doh!
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( );
TestMethodMacro(std::dec,f,GetFileName)
f->GetImageOrientationPatient( iop );
+ std::cout << " Orientation:" << std::endl;
for (int j=0; j<6; j++)
- std::cout << "iop[" << j << "] = " << iop[j] << std::endl;
+ std::cout << " iop[" << j << "] = " << iop[j] << std::endl;
if( f->IsReadable() )
{
- std::cout <<filename << " is Readable"
- << std::endl << std::endl;
+ 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)
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++;
}