X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValidator.cxx;h=23bdfe46fb2d92fc52edda3a8e98d48abfb95233;hb=fc4f7706c78baf3f60474c06d871b82db221f37b;hp=ff1b532fc1d8c62ee22bb492972ef3b13f4ab806;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx index ff1b532f..23bdfe46 100644 --- a/src/gdcmValidator.cxx +++ b/src/gdcmValidator.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValidator.cxx,v $ Language: C++ - Date: $Date: 2006/02/16 20:06:15 $ - Version: $Revision: 1.14 $ + Date: $Date: 2007/08/21 12:51:10 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,7 +24,7 @@ #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- typedef std::map GroupHT; // Hash Table @@ -79,10 +79,10 @@ DocEntry *d; grHT[d->GetGroup()] = 0; d=input->GetNextEntry(); } - for (GroupHT::iterator it = grHT.begin(); it != grHT.end(); ++it) + for (GroupHT::iterator it = grHT.begin(); it != grHT.end(); ++it) { std::cout << std::hex << it->first << std::endl; - } + } */ // berk for now SetInput do two things at the same time @@ -95,28 +95,28 @@ DocEntry *d; while(d) { if ( DataEntry *v = dynamic_cast(d) ) - { - if ( v->GetVM() != gdcm::GDCM_UNKNOWN ) + { + if ( v->GetVM() != GDCM_NAME_SPACE::GDCM_UNKNOWN ) if ( !CheckVM(v) ) { if (v->GetVM() == "FIXME" ) std::cout << "For Tag " << v->GetKey() << " VM = [" << v->GetVM() << "]" << std::endl; - + std::cout << "Tag (" << v->GetKey() - << ")-> [" << v->GetName() << "] VR :" << v->GetVR() + << ")-> [" << v->GetName() << "] VR :" << v->GetVR() << " contains an illegal VM. Expected VM :[" - << v->GetVM() << "], value [" << v->GetString() << "]" + << v->GetVM() << "], value [" << v->GetString() << "]" << std::endl; } - + if ( v->GetReadLength() % 2 ) { - std::cout << "Tag (" << v->GetKey() + std::cout << "Tag (" << v->GetKey() << ")-> [" << v->GetName() << "] has an uneven length :" << v->GetReadLength() - << " [" << v->GetString() << "] " - << std::endl; + << " [" << v->GetString() << "] " + << std::endl; } } else