X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=6a02d988000bdf26c36c98ff36461b3de07e1362;hb=de628879bbc28ca8a1c93f293d7b6c49692ebe55;hp=3eacef55dc951b9aed0b32f81113352969ce3ec6;hpb=145d405e9e35d7338bd1a7a3cccfa5b84befc042;p=gdcm.git diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 3eacef55..6a02d988 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestAllEntryVerify.cxx,v $ Language: C++ - Date: $Date: 2004/12/04 08:57:20 $ - Version: $Revision: 1.16 $ + Date: $Date: 2005/01/21 11:40:53 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,12 +15,13 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" +#include "gdcmFile.h" #include #include #include #include +#include //Generated file: #include "gdcmDataImages.h" @@ -206,7 +207,7 @@ bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt ) { std::string fileName = DataPath + fileIt->first; std::cout << Indent << "FileName: " << fileName << std::endl; - gdcm::Header* tested = new gdcm::Header( fileName.c_str() ); + gdcm::File* tested = new gdcm::File( fileName.c_str() ); if( !tested->IsReadable() ) { std::cerr << Indent << "Failed\n" @@ -229,7 +230,7 @@ bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt ) uint16_t group = axtoi( &(groupString[0]) ); uint16_t element = axtoi( &(groupElement[0]) ); - std::string testedValue = tested->GetEntryByNumber(group, element); + std::string testedValue = tested->GetEntry(group, element); if ( testedValue != j->second ) { // Oops make sure this is only the \0 that differ @@ -669,7 +670,7 @@ int TestAllEntryVerify(int argc, char* argv[]) } Parser.SetDataPath(referenceDir); // Parser.Print(); - std::cout << "Reference fil loaded -->\n" + std::cout << "Reference file loaded -->\n" << "Check files : \n"; int ret;