X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=8ecd4072e5a33c7a7cf08193ae0f3c48ce15095f;hb=4552d4ee18f3234af4e037e77abf0622c2702004;hp=a54872e037bff96cb923d166a41ca0875a8ff2fe;hpb=96cc99e8e141ceaf026104699c3273ad5fc88a1f;p=gdcm.git

diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx
index a54872e0..8ecd4072 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: 2008/09/15 15:49:20 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,11 +23,8 @@
 #include <iostream>
 #include <sstream>
 
-//Generated file:
-#include "gdcmDataImages.h"
-
-typedef std::string EntryValueType;   // same type as ValEntry::value
-typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues;
+typedef std::string EntryValueType;   // same type as DataEntry::value
+typedef std::map< GDCM_NAME_SPACE::TagKey, EntryValueType > MapEntryValues;
 typedef MapEntryValues *MapEntryValuesPtr;
 typedef std::string FileNameType;
 typedef std::map< FileNameType, MapEntryValuesPtr > MapFileValuesType;
@@ -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_NAME_SPACE::File *tested;
+   tested = new GDCM_NAME_SPACE::File( );
+   tested->SetFileName( fileName.c_str() );
+   tested->Load( );
    if( !tested->IsReadable() )
    {
      std::cerr << Indent << "Failed\n"
@@ -598,7 +599,7 @@ void ReferenceFileParser::ParseRegularLine( std::string &line)
 bool ReferenceFileParser::SecondPassReferenceFile()
    throw ( ParserException )
 {
-   gdcm::TagKey key;
+   GDCM_NAME_SPACE::TagKey key;
    EntryValueType value;
    std::string line;
    bool inBlock = false;