Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2007/06/04 08:51:24 $
- Version: $Revision: 1.59 $
+ Date: $Date: 2007/07/26 09:25:38 $
+ Version: $Revision: 1.61 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Track BigEndian troubles
std::cout << " ScalarSize : " << GetScalarSize()
<< " IsCurrentProcessorBigEndian:"
- << gdcm::Util::IsCurrentProcessorBigEndian()
+ << GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian()
<< std::endl;
//if (GetScalarSize() == 1 || GetSwapCode() == 1234)
- if (GetScalarSize() == 1 || !gdcm::Util::IsCurrentProcessorBigEndian() )
+ if (GetScalarSize() == 1 || !GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian() )
{
return true;
}
std::cout << "1...";
// new style
- gdcm::File *f = gdcm::File::New();
- f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode ( GDCM_NAME_SPACE::LD_ALL ); // Load everything
f->SetFileName( filename );
f->Load();
f->Delete();
return 1;
}
- gdcm::FileHelper *tested = gdcm::FileHelper::New( f );
+ GDCM_NAME_SPACE::FileHelper *tested = GDCM_NAME_SPACE::FileHelper::New( f );
////// Step 2:
////// Check for existence of reference baseline dicom file:
}
// Test the data size
- if (testedDataSize != referenceDataSize)
+ // *actual* image length may differ to 1 with Pixel Data Element length!
+ if ((testedDataSize+testedDataSize%2) !=
+ (referenceDataSize+referenceDataSize%2) )
{
std::cout << " Failed" << std::endl
<< " pixel ("
<< " Image size: ("
<< tested->GetFile()->GetXSize() << ","
<< tested->GetFile()->GetYSize() << ","
- << tested->GetFile()->GetZSize() << ")"
+ << tested->GetFile()->GetZSize() << ") nb of scalar components "
+ << tested->GetFile()->GetNumberOfScalarComponents()
<< std::endl;
tested->Delete();
delete reference;
}
// Test the data content
+ int length = tested->GetFile()->GetXSize()*tested->GetFile()->GetYSize()*tested->GetFile()->GetZSize()
+ *reference->GetScalarSize()*tested->GetFile()->GetNumberOfScalarComponents();
+
+ // *actual* image length may differ to 1 with Pixel Data Element length!
+ if (length != testedDataSize)
+ std::cout <<"--------------------length " << length << " != testedDataSize " << testedDataSize << std::endl;
if ( memcmp(testedImageData, referenceImageData,
- testedDataSize) != 0 )
+ length/*testedDataSize*/) != 0 )
{
std::string ts = tested->GetFile()->GetTransferSyntax();
<< ") differ (as expanded in memory)."
<< std::endl
<< " compression : "
- << gdcm::Global::GetTS()->GetValue(ts) << std::endl;
+ << GDCM_NAME_SPACE::Global::GetTS()->GetValue(ts) << std::endl;
std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE
<< " pixels differing (pos : test - ref) :"
int TestAllReadCompareDicom(int argc, char *argv[])
{
// Temporarily added, to track BigEndian troubles
-gdcm::Debug::WarningOn();
+GDCM_NAME_SPACE::Debug::WarningOn();
if (argc == 4)
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
if ( argc >= 3 )
{
std::string baseLineDir = GDCM_DATA_ROOT;
baseLineDir += "/BaselineDicom";
- if( !gdcm::DirList::IsDirectory(baseLineDir) )
+ if( !GDCM_NAME_SPACE::DirList::IsDirectory(baseLineDir) )
{
std::cerr << " The reference baseline directory " << std::endl
<< " "
//if (gdcmDataImages[i] == "D_CLUNIE_CT2_RLE.dcm")
// gdcm::Debug::DebugOn(); // track pb on BigEndian Proc
//else
- gdcm::Debug::DebugOff();
+ GDCM_NAME_SPACE::Debug::DebugOff();
////// Step 1 (see above description):
std::string filename = GDCM_DATA_ROOT;