BUG: Moving gdcmCommon to gdcm namespace broke some examples, fix those

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 524ac27..9b7e61e 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
    std::cout << " NumberOfScalarComponents " << numberOfScalarComponents <<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/Example/PrintHeader.cxx b/Example/PrintHeader.cxx
index 201cb3c..5f09579 100644 (file)
--- 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 0ccc070..995dcf2 100644 (file)
--- 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 4aa6b6e..cf2ab56 100644 (file)
--- 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;
 }