Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2007/06/21 14:59:05 $
- Version: $Revision: 1.60 $
+ Date: $Date: 2008/09/15 15:49:21 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
}
// 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();
}
//if (gdcmDataImages[i] == "D_CLUNIE_CT2_RLE.dcm")
-// gdcm::Debug::DebugOn(); // track pb on BigEndian Proc
+// GDCM_NAME_SPACE::Debug::DebugOn(); // track pb on BigEndian Proc
//else
GDCM_NAME_SPACE::Debug::DebugOff();