+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
+ Language: C++
+ Date: $Date: 2004/11/24 10:23:46 $
+ Version: $Revision: 1.17 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
#include "gdcmHeader.h"
#include "gdcmFile.h"
+#include <stdio.h>
//Generated file:
#include "gdcmDataImages.h"
-int InternalTest(std::string const & filename, std::string const & referenceFileName )
+int InternalTest(std::string const & filename,
+ std::string const & referenceFileName )
{
std::cout << " Testing: " << filename << std::endl;
- gdcmFile* tested = new gdcmFile( filename );
+ gdcm::File* tested = new gdcm::File( filename );
if( !tested->GetHeader()->IsReadable() )
{
std::cout << " Image not gdcm compatible:"
if (! testFILE )
{
////// Step 3a:
+ uint8_t* testedImageData = tested->GetImageData(); // Kludge
+ (void)testedImageData;
- int testedDataSize = tested->GetImageDataSize();
- (void)testedDataSize;
- void* testedImageData = tested->GetImageData(); // Kludge
tested->WriteDcmExplVR( referenceFileName );
std::cerr << " Creating reference baseline file :" << std::endl
<< " " << referenceFileName
<< std::endl;
delete tested;
- delete (char*)testedImageData;
+ //delete (char*)testedImageData;
return 0;
}
else
////// When reference file is not gdcm readable test is failed:
- gdcmFile* reference = new gdcmFile( referenceFileName );
+ gdcm::File* reference = new gdcm::File( referenceFileName );
if( !reference->GetHeader()->IsReadable() )
{
- std::cout << " Reference image " << std::endl
- << " " << referenceFileName <<std::endl
- << " is not gdcm compatible." << std::endl;
+ std::cout << " Failed: reference image " << std::endl
+ << " " << referenceFileName <<std::endl
+ << " is not gdcm compatible." << std::endl;
delete tested;
delete reference;
return 1;
////// Step 3b:
int testedDataSize = tested->GetImageDataSize();
- void* testedImageData = tested->GetImageData();
+ uint8_t* testedImageData = tested->GetImageData();
int referenceDataSize = reference->GetImageDataSize();
- void* referenceImageData = reference->GetImageData();
+ uint8_t* referenceImageData = reference->GetImageData();
if (testedDataSize != referenceDataSize)
{
- std::cout << " Pixel areas lengths differ: "
+ std::cout << " Failed" << std::endl
+ << " pixel areas lengths differ: "
<< testedDataSize << " # " << referenceDataSize
<< std::endl;
delete tested;
delete reference;
- delete (char*)testedImageData;
- delete (char*)referenceImageData;
return 1;
}
testedDataSize) != 0 )
{
(void)res;
- std::cout << " Pixel differ (as expanded in memory)."
+ std::cout << " Failed" << std::endl
+ << " pixel differ (as expanded in memory)."
<< std::endl;
delete tested;
delete reference;
- delete (char*)testedImageData;
- delete (char*)referenceImageData;
return 1;
}
- std::cout << " Passed." << std::endl ;
//////////////// Clean up:
delete tested;
delete reference;
- delete (char*)testedImageData;
- delete (char*)referenceImageData;
+
+ std::cout << " Passed..." << std::endl;
return 0;
}
<< std::endl << std::endl;
int i = 0;
+ int result = 0;
while( gdcmDataImages[i] != 0 )
{
////// Check for existence of reference baseline directory
std::string baseLineDir = GDCM_DATA_ROOT;
baseLineDir += "/BaselineDicom/";
- FILE* testFILE = fopen( baseLineDir.c_str(), "r" );
- if (!testFILE )
+ std::ifstream* testDIR = new std::ifstream(baseLineDir.c_str(), std::ios::in | std::ios::binary);
+ if (!testDIR )
{
std::cerr << " The reference baseline directory " << std::endl
<< " "
}
else
{
- fclose( testFILE );
+ testDIR->close();
}
////// Step 1 (see above description):
-
std::string filename = GDCM_DATA_ROOT;
filename += "/";
filename += gdcmDataImages[i];
if( InternalTest( filename, referenceFileName ) != 0 )
{
- return 1;
+ result++;
}
}
- return 0;
+ return result;
}