Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 20:16:56 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/01/20 16:16:59 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmHeader.h"
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
+
#include <iostream>
+#include <fstream>
//Generated file:
#include "gdcmDataImages.h"
////// Step 1:
std::cout << " 1...";
- gdcm::File* tested = new gdcm::File( filename );
+ gdcm::FileHelper* tested = new gdcm::FileHelper( filename );
if( !tested->GetHeader()->IsReadable() )
{
std::cout << " Failed" << std::endl
////// Check for existence of reference baseline dicom file:
std::cout << "2...";
- FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+ //FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+ std::ifstream testFILE( referenceFileName.c_str() );
if (! testFILE )
{
uint8_t* testedImageData = tested->GetImageData(); // Kludge
}
else
{
- fclose( testFILE );
+ //fclose( testFILE );
}
+ testFILE.close();
////// Step 3a:
////// When reference file is not gdcm readable test is failed:
std::cout << "3a...";
- gdcm::File* reference = new gdcm::File( referenceFileName );
+ gdcm::FileHelper* reference = new gdcm::FileHelper( referenceFileName );
if( !reference->GetHeader()->IsReadable() )
{
std::cout << " Failed" << std::endl
return 1;
}
+ std::string PixelType = reference->GetHeader()->GetPixelType();
+
////// Step 3b:
std::cout << "3b...";
int testedDataSize = tested->GetImageDataSize();
if (testedDataSize != referenceDataSize)
{
std::cout << " Failed" << std::endl
- << " pixel areas lengths differ: "
+ << " pixel ("
+ << PixelType
+ <<") areas lengths differ: "
<< testedDataSize << " # " << referenceDataSize
<< std::endl;
delete tested;
{
(void)res;
std::cout << " Failed" << std::endl
- << " pixel differ (as expanded in memory)."
+ << " pixel ("
+ << PixelType
+ << ") differ (as expanded in memory)."
<< std::endl;
delete tested;
delete reference;