From 2837a6b7c035eca52b4d6883de23f90b5633a0e6 Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 2 Nov 2004 03:42:29 +0000 Subject: [PATCH] BUG: Moving gdcmCommon to gdcm namespace broke some examples, fix those --- Example/PrintFile.cxx | 2 +- Example/PrintHeader.cxx | 2 +- Testing/TestAllEntryVerify.cxx | 4 ++-- Testing/TestTS.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 524ac27f..9b7e61e0 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -53,7 +53,7 @@ int main(int argc, char* argv[]) std::cout << " NumberOfScalarComponents " << numberOfScalarComponents <GetEntryByNumber(0x0002,0x0010) == GDCM_NOTLOADED ) { + if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) { std::cout << "Transfert Syntax not loaded. " << std::endl << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" << std::endl; diff --git a/Example/PrintHeader.cxx b/Example/PrintHeader.cxx index 201cb3c9..5f095794 100644 --- a/Example/PrintHeader.cxx +++ b/Example/PrintHeader.cxx @@ -32,7 +32,7 @@ int main(int argc, char* argv[]) std::cout << "\n\n" << std::endl; - if ( e1->GetEntryByNumber(0x0002,0x0010) == GDCM_NOTLOADED ) { + if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) { std::cout << "Transfert Syntax not loaded. " << std::endl << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" << std::endl; diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 0ccc070f..995dcf26 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -9,7 +9,7 @@ #include "gdcmDataImages.h" typedef std::string EntryValueType; // same type as ValEntry::value -typedef std::map< TagKey, EntryValueType > MapEntryValues; +typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues; typedef MapEntryValues* MapEntryValuesPtr; typedef std::string FileNameType; typedef std::map< FileNameType, MapEntryValuesPtr > MapFileValuesType; @@ -533,7 +533,7 @@ void ReferenceFileParser::ParseRegularLine( std::string& line) bool ReferenceFileParser::SecondPassReferenceFile() throw ( ParserException ) { - TagKey key; + gdcm::TagKey key; EntryValueType value; std::string line; bool inBlock = false; diff --git a/Testing/TestTS.cxx b/Testing/TestTS.cxx index 4aa6b6ee..cf2ab560 100644 --- a/Testing/TestTS.cxx +++ b/Testing/TestTS.cxx @@ -6,5 +6,5 @@ int TestTS(int , char *[]) // There should be 150 entries ts.Print( std::cout ); - return ts.GetValue( "" ) != GDCM_UNFOUND; + return ts.GetValue( "" ) != gdcm::GDCM_UNFOUND; } -- 2.45.1