X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=cadead8a8986d8a576ed40a9ee380f561f5e79a7;hb=2039f4b8512f86134db9c85ea3d4645c3b8ab191;hp=48a03f8b87c30fc56a6c8e4557b4f5c7ded60113;hpb=6b0359d3c073112a5d6a23114d6adb0fff949e7b;p=gdcm.git diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx index 48a03f8b..cadead8a 100644 --- a/Testing/TestReadWriteReadCompare.cxx +++ b/Testing/TestReadWriteReadCompare.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestReadWriteReadCompare.cxx,v $ Language: C++ - Date: $Date: 2005/02/09 15:06:48 $ - Version: $Revision: 1.22 $ + Date: $Date: 2005/07/21 04:51:26 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,17 +17,20 @@ =========================================================================*/ #include "gdcmFile.h" #include "gdcmFileHelper.h" +#include "gdcmDebug.h" //Generated file: #include "gdcmDataImages.h" - -int CompareInternal(std::string const & filename, std::string const & output) + +int CompareInternal(std::string const &filename, std::string const &output) { std::cout << " Testing: " << filename << std::endl; //////////////// Step 1 (see above description): - gdcm::File *file = new gdcm::File( filename ); + gdcm::File *file = new gdcm::File( ); + file->SetFileName( filename ); + file->Load (); if( !file->IsReadable() ) { std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:" @@ -52,17 +55,23 @@ int CompareInternal(std::string const & filename, std::string const & output) std::cout << "2..."; //////////////// Step 3: - gdcm::FileHelper *reread = new gdcm::FileHelper( output ); - if( !reread->GetFile()->IsReadable() ) + gdcm::File *fileout = new gdcm::File(); + fileout->SetFileName( output ); + fileout->Load(); + // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated + + if( !fileout->IsReadable() ) { std::cerr << "Failed" << std::endl - << "Test::TestReadWriteReadCompare: Could not reread image " - << "written:" << filename << std::endl; + << "Test::TestReadWriteReadCompare: Could not parse the newly " + << "written image:" << filename << std::endl; delete file; delete filehelper; - delete reread; return 1; } + + gdcm::FileHelper *reread = new gdcm::FileHelper( fileout ); + std::cout << "3..."; // For the next step: int dataSizeWritten = reread->GetImageDataSize(); @@ -123,13 +132,17 @@ int CompareInternal(std::string const & filename, std::string const & output) int TestReadWriteReadCompare(int argc, char *argv[]) { int result = 0; - if (argc == 3) + + if (argc == 4) + gdcm::Debug::DebugOn(); + + if (argc >= 3) { - const std::string input = argv[1]; + const std::string input = argv[1]; const std::string output = argv[2]; result += CompareInternal(input, output); } - else if( argc > 3 || argc == 2 ) + else if( argc > 4 || argc == 2 ) { std::cerr << "Please read the manual" << std::endl; }