X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=089b4c1b1ed61570203d00112ff5379eb6e149e4;hb=c7f1edff8d20eac561dc6614a63ed633d49fd06d;hp=7eb124e7410ee7c99163308060c5c4f07e6252f4;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 7eb124e7..089b4c1b 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/01/24 16:10:50 $ - Version: $Revision: 1.21 $ + Date: $Date: 2005/01/25 15:29:33 $ + Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,12 +68,12 @@ private: bool Check( MapFileValuesType::iterator &fileIt ); std::string ExtractValue(std::string& toSplit) throw ( ParserException ); - void ParseRegularLine( std::string& line ) throw ( ParserException ); - void FirstPassReferenceFile() throw ( ParserException ); - bool SecondPassReferenceFile() throw ( ParserException ); - void HandleFileName( std::string& line ) throw ( ParserException ); - void HandleKey( std::string& line ) throw ( ParserException ); - bool HandleValue( std::string& line ) throw ( ParserException ); + void ParseRegularLine( std::string& line ) throw ( ParserException ); + void FirstPassReferenceFile() throw ( ParserException ); + bool SecondPassReferenceFile() throw ( ParserException ); + void HandleFileName( std::string& line ) throw ( ParserException ); + void HandleKey( std::string& line ) throw ( ParserException ); + bool HandleValue( std::string& line ) throw ( ParserException ); static uint16_t axtoi( char* ); private: /// The directory containing the images to check: @@ -115,12 +115,12 @@ uint16_t ReferenceFileParser::axtoi(char *hexStg) { while (n < 4) { if (hexStg[n]=='\0') break; - if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 - digit[n] = hexStg[n] & 0x0f; //convert to int + if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 + digit[n] = hexStg[n] & 0x0f; //convert to int else if (hexStg[n] >='a' && hexStg[n] <= 'f') //if a to f - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int else if (hexStg[n] >='A' && hexStg[n] <= 'F') //if A to F - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int else break; n++; }