X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=d506661a5c283f37faaa43a5d1749f2f1413ac28;hb=a331d5552949298f5d59b7a7bd78552a875a0214;hp=a54872e037bff96cb923d166a41ca0875a8ff2fe;hpb=96cc99e8e141ceaf026104699c3273ad5fc88a1f;p=gdcm.git diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index a54872e0..d506661a 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestAllEntryVerify.cxx,v $ Language: C++ - Date: $Date: 2005/02/03 10:00:06 $ - Version: $Revision: 1.25 $ + Date: $Date: 2005/07/11 14:47:19 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,9 +23,6 @@ #include #include -//Generated file: -#include "gdcmDataImages.h" - typedef std::string EntryValueType; // same type as ValEntry::value typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues; typedef MapEntryValues *MapEntryValuesPtr; @@ -157,7 +154,7 @@ uint16_t ReferenceFileParser::axtoi(char *hexStg) m--; // adjust the position to set n++; // next digit to process } - return intValue; + return (uint16_t)intValue; } void ReferenceFileParser::SetDataPath( std::string &inDataPath ) @@ -229,7 +226,11 @@ bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt ) { std::string fileName = DataPath + fileIt->first; std::cout << Indent << "FileName: " << fileName << std::endl; - gdcm::File *tested = new gdcm::File( fileName.c_str() ); + + gdcm::File *tested; + tested = new gdcm::File( ); + tested->SetFileName( fileName.c_str() ); + tested->Load( ); if( !tested->IsReadable() ) { std::cerr << Indent << "Failed\n"