Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2005/07/06 09:53:43 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2005/08/30 15:13:07 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
////// Step 1:
std::cout << "1...";
- gdcm::FileHelper *tested = new gdcm::FileHelper( filename );
- if( !tested->GetFile()->IsReadable() )
+
+ // new style
+ gdcm::File *f = new gdcm::File();
+ f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
+ f->SetFileName( filename );
+ f->Load();
+
+ if( !f->IsReadable() )
{
std::cout << " Failed" << std::endl
<< " Image not gdcm compatible:"
<< filename << std::endl;
- delete tested;
+ delete f;
return 1;
}
-
+ gdcm::FileHelper *tested = new gdcm::FileHelper( f );
+
////// Step 2:
////// Check for existence of reference baseline dicom file:
std::cout << "2...";
<< filename << std::endl;
delete reference;
delete tested;
+ delete f;
return 1;
}
<< reference->GetZSize() << std::endl;
delete reference;
delete tested;
+ delete f;
return 1;
}
<< reference->GetNumberOfComponents() << std::endl;
delete reference;
delete tested;
- return 1;
+ delete f;
}
// Test the data size
<< std::endl;
delete tested;
delete reference;
+ delete f;
return 1;
}
delete tested;
delete reference;
+ delete f;
return 1;
}
//////////////// Clean up:
delete tested;
delete reference;
+ delete f;
std::cout << "OK." << std::endl;