Program: gdcm
Module: $RCSfile: TestReadWriteJPEGReadCompare.cxx,v $
Language: C++
- Date: $Date: 2007/09/04 14:44:45 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2007/09/05 09:55:01 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10;
-int nb_of_success___;
-int nb_of_failure___;
-int nb_of_diffPM1___;
+int nb_of_successJPEG___;
+int nb_of_failureJPEG___;
+int nb_of_diffPM1JPEG___;
static int CompareInternalJPEG(std::string const &filename, std::string const &output)
{
std::cout << "----------------------------------------------------------------------" << std::endl
<< "Test::TestReadWriteJPEGReadCompare: Image not gdcm compatible:"
<< filename << std::endl;
file->Delete();
- nb_of_failure___++;
+ nb_of_failureJPEG___++;
return 1;
}
std::cout << " step 1...";
// (even if we do it by setting a flag, *he* will have to decide)
//filehelper->SetImageData(imageData, dataSize);
-
- filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels reain unimpared
- filehelper->SetWriteModeToRaw();
- filehelper->SetWriteTypeToJPEG( );
-
+
+ filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels remain unimpared
+ filehelper->SetWriteModeToRaw();
+ filehelper->SetWriteTypeToJPEG( );
+
filehelper->SetUserData(imageData,dataSize); // This one ensures the compression
- filehelper->Write( output );
+ filehelper->Write( output );
std::cout << "2...";
file->Delete();
filehelper->Delete();
fileout->Delete();
- nb_of_failure___++;
+ nb_of_failureJPEG___++;
return 1;
}
-
if ( file->GetBitsAllocated()>16 )
{
std::cout << "=============== 32 bits, not checked...OK." << std::endl ;
return 0;
}
-
GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( fileout );
std::cout << "3...";
filehelper->Delete();
fileout->Delete();
reread->Delete();
- nb_of_failure___++;
+ nb_of_failureJPEG___++;
return 1;
}
// beware of odd length Pixel Element!
if (dataSize != dataSizeWritten)
std::cout << std::endl << "dataSize:" << dataSize << " dataSizeWritten:" << dataSizeWritten << std::endl;
-
+
int dataSizeFixed = dataSize - dataSize%2;
int dataSizeWrittenFixed = dataSizeWritten - dataSizeWritten%2;
filehelper->Delete();
fileout->Delete();
reread->Delete();
- nb_of_failure___++;
+ nb_of_failureJPEG___++;
return 1;
}
// Test the data content
-
- unsigned int j =0;
- unsigned int nbDiff =0;
+ unsigned int j = 0;
+ unsigned int nbDiff = 0;
if (memcmp(imageData, imageDataWritten, dataSizeFixed) !=0)
- {
+ {
std::string PixelType = filehelper->GetFile()->GetPixelType();
std::string ts = filehelper->GetFile()->GetTransferSyntax();
filehelper->Delete();
fileout->Delete();
reread->Delete();
- nb_of_failure___++;
+ nb_of_failureJPEG___++;
if (nbDiff/2 > 8 ) // last pixel of (DermaColorLossLess.dcm) is diferent. ?!?
- // I don't want it to break the testsuite
+ // I don't want it to break the testsuite
return 1;
else
return 0;
}
}
std::cout << std::endl;
- nb_of_diffPM1___++;
+ nb_of_diffPM1JPEG___++;
}
}
else
{
- nb_of_success___ ++;
+ nb_of_successJPEG___ ++;
}
std::cout << "=============== 4...OK." << std::endl ;
//////////////// Clean up:
int TestReadWriteJPEGReadCompare(int argc, char *argv[])
{
int result = 0;
- nb_of_success___ = 0;
- nb_of_failure___ = 0;
-// nb_of_diffPM1___ = 0;
+ nb_of_successJPEG___ = 0;
+ nb_of_failureJPEG___ = 0;
+ nb_of_diffPM1JPEG___ = 0;
if (argc == 4)
GDCM_NAME_SPACE::Debug::DebugOn();
filename += "/";
filename += gdcmDataImages[i];
res = CompareInternalJPEG(filename, "TestReadWriteJPEGReadCompare.dcm");
+
if (res == 1)
{
std::cout << "=============================== Failure on: " << gdcmDataImages[i] << std::endl;
}
}
std::cout << "==================================" << std::endl;
- std::cout << "nb of success " << nb_of_success___ << std::endl;
- std::cout << "nb of failure " << nb_of_failure___ << std::endl;
-// std::cout << "nb of diff+/-1 " << nb_of_diffPM1___ << std::endl;
+ std::cout << "nb of success " << nb_of_successJPEG___ << std::endl;
+ std::cout << "nb of failure " << nb_of_failureJPEG___ << std::endl;
+ std::cout << "nb of diff+/-1 " << nb_of_diffPM1JPEG___ << std::endl;
return result;
}