From 53b7ec6a9882fd6fbc4f4b9e406819e6ab1e4f2c Mon Sep 17 00:00:00 2001 From: malaterre Date: Wed, 14 Jul 2004 15:10:42 +0000 Subject: [PATCH] ENH: Some fix, plus some cleanup --- Testing/TestAllReadCompareDicom.cxx | 22 ++-- Testing/TestReadWriteReadCompare.cxx | 173 ++++++++++++++------------- 2 files changed, 100 insertions(+), 95 deletions(-) diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx index e2474b95..0c0595c8 100644 --- a/Testing/TestAllReadCompareDicom.cxx +++ b/Testing/TestAllReadCompareDicom.cxx @@ -53,25 +53,27 @@ int TestAllReadCompareDicom(int argc, char* argv[]) FILE* testFILE = fopen( baseLineDir.c_str(), "r" ); if (! testFILE ) { - std::cerr << " The reference baseline directory " << std::endl - << " " - << baseLineDir << std::endl - << " couldn't be opened." - << std::endl; - return 1; + std::cerr << " The reference baseline directory " << std::endl + << " " + << baseLineDir << std::endl + << " couldn't be opened." + << std::endl; + return 1; } else - fclose( testFILE ); + { + fclose( testFILE ); + } ////// Step 1 (see above description): std::string filename = GDCM_DATA_ROOT; - filename += "/"; //doh! + filename += "/"; filename += gdcmDataImages[i]; std::cout << " Testing: " << filename << std::endl; - gdcmFile* tested = new gdcmFile( filename.c_str(), false, true ); + gdcmFile* tested = new gdcmFile( filename, false, true ); if( !tested->GetHeader()->IsReadable() ) { std::cout << " Image not gdcm compatible:" @@ -108,7 +110,9 @@ int TestAllReadCompareDicom(int argc, char* argv[]) continue; } else + { fclose( testFILE ); + } ////// When reference file is not gdcm readable test is failed: diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx index d46bf274..3df0cbdf 100644 --- a/Testing/TestReadWriteReadCompare.cxx +++ b/Testing/TestReadWriteReadCompare.cxx @@ -6,9 +6,10 @@ int TestReadWriteReadCompare(int argc, char* argv[]) { - if (argc) { - std::cerr << "Test::TestReadWriteReadCompare: Usage: " << argv[0] - << " (no arguments needed)." << std::endl; + if (argc) + { + std::cerr << "Test::TestReadWriteReadCompare: Usage: " << argv[0] + << " (no arguments needed)." << std::endl; } std::cout<< "Test::TestReadWriteReadCompare: description " << std::endl; @@ -27,104 +28,104 @@ int TestReadWriteReadCompare(int argc, char* argv[]) << "images " << std::endl << " match (as expanded by gdcm)." << std::endl; - int i = 0; - while( gdcmDataImages[i] != 0 ) - { - std::string filename = GDCM_DATA_ROOT; - filename += "/"; //doh! - filename += gdcmDataImages[i++]; + int i = 0; + while( gdcmDataImages[i] != 0 ) + { + std::string filename = GDCM_DATA_ROOT; + filename += "/"; + filename += gdcmDataImages[i++]; - std::cout << " Testing: " << filename << std::endl; + std::cout << " Testing: " << filename << std::endl; - //////////////// Step 1 (see above description): + //////////////// Step 1 (see above description): - gdcmHeader *header = new gdcmHeader( filename.c_str(), false, true ); - if( !header->IsReadable() ) + gdcmHeader *header = new gdcmHeader( filename, false, true ); + if( !header->IsReadable() ) { - std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" - << filename << std::endl; - delete header; - return 0; + std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" + << filename << std::endl; + delete header; + return 1; } - std::cout << " step 1 ..."; + std::cout << " step 1 ..."; - //////////////// Step 2: + //////////////// Step 2: - gdcmFile* file = new gdcmFile( header ); - int dataSize = file->GetImageDataSize(); - void* imageData = file->GetImageData(); //EXTREMELY IMPORTANT + gdcmFile* file = new gdcmFile( header ); + int dataSize = file->GetImageDataSize(); + void* imageData = file->GetImageData(); //EXTREMELY IMPORTANT - /// \todo Following line commented out because gdcmFile::SetImageData() is - /// brain dead: it sets ImageDataSize to its argument and PixelRead to a. - /// Later on, when writing gdcmFile::WriteBase() and because PixelRead == 1 - /// we call - /// PixelElement->SetLength( ImageDataSizeRaw ); - /// where we use ImageDataSizeRAW instead of ImageDataSize ! - /// But when the original image made the transformation LUT -> RGB, - /// ImageDataSizeRaw is the third of ImageDataSize, and there is no - /// reason (since we called gdcmFile::SetImageData) to use the Raw image - /// size... This "bug" in gdcmFile made that we had to black list - /// images 8BitsUncompressedColor.dcm, OT-PAL-8-face.dcm and - /// US-PAL-8-10x-echo.dcm... - /// In conclusion fix gdcmFile, and then uncomment the following line. - /// file->SetImageData(imageData, dataSize); - file->WriteDcmExplVR( "TestReadWriteReadCompare.dcm" ); - std::cout << "2..."; + /// \todo Following line commented out because gdcmFile::SetImageData() is + /// brain dead: it sets ImageDataSize to its argument and PixelRead to a. + /// Later on, when writing gdcmFile::WriteBase() and because PixelRead == 1 + /// we call + /// PixelElement->SetLength( ImageDataSizeRaw ); + /// where we use ImageDataSizeRAW instead of ImageDataSize ! + /// But when the original image made the transformation LUT -> RGB, + /// ImageDataSizeRaw is the third of ImageDataSize, and there is no + /// reason (since we called gdcmFile::SetImageData) to use the Raw image + /// size... This "bug" in gdcmFile made that we had to black list + /// images 8BitsUncompressedColor.dcm, OT-PAL-8-face.dcm and + /// US-PAL-8-10x-echo.dcm... + /// In conclusion fix gdcmFile, and then uncomment the following line. + /// file->SetImageData(imageData, dataSize); + file->WriteDcmExplVR( "TestReadWriteReadCompare.dcm" ); + std::cout << "2..."; - //////////////// Step 3: + //////////////// Step 3: - gdcmFile* reread = new gdcmFile( "TestReadWriteReadCompare.dcm", + gdcmFile* reread = new gdcmFile( "TestReadWriteReadCompare.dcm", false, true ); - if( !reread->GetHeader()->IsReadable() ) - { - std::cerr << "Test::TestReadWriteReadCompare: Could not reread image " - << "written:" << filename << std::endl; - delete header; - delete file; - delete reread; - return 1; - } - std::cout << "3..."; - // For the next step: - int dataSizeWritten = reread->GetImageDataSize(); - void* imageDataWritten = reread->GetImageData(); + if( !reread->GetHeader()->IsReadable() ) + { + std::cerr << "Test::TestReadWriteReadCompare: Could not reread image " + << "written:" << filename << std::endl; + delete header; + delete file; + delete reread; + return 1; + } + std::cout << "3..."; + // For the next step: + int dataSizeWritten = reread->GetImageDataSize(); + void* imageDataWritten = reread->GetImageData(); - //////////////// Step 4: + //////////////// Step 4: - if (dataSize != dataSizeWritten) - { - std::cout << std::endl - << " Pixel areas lengths differ: " - << dataSize << " # " << dataSizeWritten << std::endl; - delete (char*)imageData; - delete (char*)imageDataWritten; - delete header; - delete file; - delete reread; - return 1; - } + if (dataSize != dataSizeWritten) + { + std::cout << std::endl + << " Pixel areas lengths differ: " + << dataSize << " # " << dataSizeWritten << std::endl; + delete (char*)imageData; + delete (char*)imageDataWritten; + delete header; + delete file; + delete reread; + return 1; + } - if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) - { - (void)res; - std::cout << std::endl - << " Pixel differ (as expanded in memory)." << std::endl; - delete (char*)imageData; - delete (char*)imageDataWritten; - delete header; - delete file; - delete reread; - return 1; - } - std::cout << "4...OK." << std::endl ; + if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) + { + (void)res; + std::cout << std::endl + << " Pixel differ (as expanded in memory)." << std::endl; + delete (char*)imageData; + delete (char*)imageDataWritten; + delete header; + delete file; + delete reread; + return 1; + } + std::cout << "4...OK." << std::endl ; - //////////////// Clean up: - delete (char*)imageData; - delete (char*)imageDataWritten; - delete header; - delete file; - delete reread; - } + //////////////// Clean up: + delete (char*)imageData; + delete (char*)imageDataWritten; + delete header; + delete file; + delete reread; + } return 0; } -- 2.45.1