* Remove #define and replace then by the call to the corresponding

     variables (in the LodModeType enum) - Thanks to Mathieu
   -- BeNours

diff --git a/Example/Anonymize.cxx b/Example/Anonymize.cxx
index 2d99336afe03c03ce7ac661c12c27b161ecc92f9..16983535180204d0a58e446c8abe02a7f1a360bd 100644 (file)
--- a/Example/Anonymize.cxx
+++ b/Example/Anonymize.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Anonymize.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
    gdcm::File *f;
 
    f = new gdcm::File(  );
-   f->SetLoadMode( GDCM_LD_ALL );
+   f->SetLoadMode( gdcm::LD_ALL );
    f->SetFileName( fileName );
    int res = f->Load();
 

diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx
index cf6f22ee5d80c7035ac8ca9cf5dd0077de3d916b..3fa8500583f2e5cbf000660614440308e99440c9 100644 (file)
--- a/Example/AnonymizeNoLoad.cxx
+++ b/Example/AnonymizeNoLoad.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: AnonymizeNoLoad.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -75,15 +75,15 @@ int main(int argc, char *argv[])
        return 0;
  }
  
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+      loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    int rubOutNb;

diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index 3da658b7bedec9a63bea7058de943ed082a02475..76cf5b18f5f90ad62b65b325f3713484330b7122 100644 (file)
--- a/Example/MakeDicomDir.cxx
+++ b/Example/MakeDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: MakeDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -73,15 +73,15 @@ int main(int argc, char *argv[])
    char *dirName;   
    dirName  = am->ArgMgrGetString("dirName",(char *)"."); 
 
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    if (am->ArgMgrDefined("debug"))

diff --git a/Example/PatchHeader.cxx b/Example/PatchHeader.cxx
index 23dbfd112848e0308f30594392aa93313e0d9f14..27654339ab8d9965dfd21ee63171c00e3cfd94b6 100644 (file)
--- a/Example/PatchHeader.cxx
+++ b/Example/PatchHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PatchHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -264,15 +264,15 @@ int main(int argc, char *argv[])
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
  
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    /* if unused Param we give up */

diff --git a/Example/PrintDocument.cxx b/Example/PrintDocument.cxx
index e2f9ce6f3ac33bf8044fd050cca7d381e94c36b3..c5472a3ce23b09c3888badec309a01280f9224e5 100644 (file)
--- a/Example/PrintDocument.cxx
+++ b/Example/PrintDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
       gdcm::Debug::DebugOn(); 
 
    if (argc > 4)
-      e1->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW);
+      e1->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
    e1->SetFileName( fileName.c_str() );
    e1->Load( );
 

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 3b4216231dbaa76285d174d4903e58aa49ace8c6..4310831a6d90de76c4f8fa5a598fa17109f30771 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -165,15 +165,15 @@ int main(int argc, char *argv[])
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
  
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    int level = am->ArgMgrGetInt("level", 2);

diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx
index 430f11aa46e15077fc37dde0d3817f3e44fa6a92..1a6c735b7a67d89beba9be6769a87107a88c43ea 100644 (file)
--- a/Example/ReWrite.cxx
+++ b/Example/ReWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: ReWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/08/30 15:13:05 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,15 +68,15 @@ int main(int argc, char *argv[])
 
    char *mode = am->ArgMgrGetString("mode",(char *)"X");
 
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
    if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    bool rgb = ( 0 != am->ArgMgrDefined("RGB") );

diff --git a/Example/TestPrintTime.cxx b/Example/TestPrintTime.cxx
index 68dec9e3e844c0ba9a7b8bde38c678f579b57f80..a67cb203ad3a10470e50a862339c0c3afb4ceb2c 100644 (file)
--- a/Example/TestPrintTime.cxx
+++ b/Example/TestPrintTime.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestPrintTime.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -59,7 +59,7 @@ int main(int, char *[])
       std::cout << "-----------Not Readable " << std::endl;
       delete e1;
       e1= new gdcm::File( );
-      e1->SetLoadMode( GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW );
+      e1->SetLoadMode( gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW );
       r3 = times(&tms3);
       e1->SetFileName( filename );
       e1->Load( );
@@ -120,7 +120,7 @@ int main(int, char *[])
         filename += gdcmDataImages[i];
 
         e1= new gdcm::File( );
-        e1->SetLoadMode( GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW );
+        e1->SetLoadMode( gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW );
         e1->SetFileName( filename );
         e1->Load( );
         if (!e1->IsReadable())

diff --git a/Example/exColorToRGB.cxx b/Example/exColorToRGB.cxx
index d62cbe97c8a35573ce9fdebd684b599f2730eba2..55585731466142cdb76b59af99e5a56c84884e3b 100644 (file)
--- a/Example/exColorToRGB.cxx
+++ b/Example/exColorToRGB.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exColorToRGB.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
    std::cout << argv[1] << std::endl;
 
    gdcm::File *f = new gdcm::File();
-   f->SetLoadMode( GDCM_LD_ALL);
+   f->SetLoadMode( gdcm::LD_ALL);
    f->SetFileName( fileName );
    bool res = f->Load();        
 

diff --git a/Example/exGC.cxx b/Example/exGC.cxx
index 4d5e411feb8b8462d931dfebadf04f34e6b465dd..9e1d4c48aff2b02ef5e14b9dbd1fdda07bc931fd 100644 (file)
--- a/Example/exGC.cxx
+++ b/Example/exGC.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exGC.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
    std::cout << argv[1] << std::endl;
 
    gdcm::File *f = new gdcm::File();
-   f->SetLoadMode( GDCM_LD_ALL);
+   f->SetLoadMode( gdcm::LD_ALL);
    f->SetFileName( fileName );
    bool res = f->Load();        
 

diff --git a/Example/exImageLighten.cxx b/Example/exImageLighten.cxx
index fed6a9d89793dc02d25161d75f2d0d86fa633665..0b94d6101ee3e001a1dfadd7f8a9ab37fe098b39 100644 (file)
--- a/Example/exImageLighten.cxx
+++ b/Example/exImageLighten.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exImageLighten.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
    std::cout << argv[1] << std::endl;
 
    gdcm::File *f = new gdcm::File();
-   f->SetLoadMode( GDCM_LD_ALL);
+   f->SetLoadMode( gdcm::LD_ALL);
    f->SetFileName( fileName );
    bool res = f->Load();        
 

diff --git a/Example/exOverlaysACR.cxx b/Example/exOverlaysACR.cxx
index 01a0492aec9e5d4fbada2fa3074762380bcc3685..3af7774caf20e25d6a3584fb27404f9aba3083c4 100644 (file)
--- a/Example/exOverlaysACR.cxx
+++ b/Example/exOverlaysACR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exOverlaysACR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
    f = new gdcm::File( );
 
-   f->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW);
+   f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
    f->SetFileName( fileName );
    bool res = f->Load();  
 

diff --git a/Example/exPrintWritePrint.cxx b/Example/exPrintWritePrint.cxx
index 3bb545c30ff8e4f1129d82a5bfb9ff533f8946f7..8a6ea7594a07cef8446d80f7707d3de652cae267 100644 (file)
--- a/Example/exPrintWritePrint.cxx
+++ b/Example/exPrintWritePrint.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exPrintWritePrint.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
    std::string mode = argv[2];
 
    f = new gdcm::File( );
-   f->SetLoadMode( GDCM_LD_NOSEQ );
+   f->SetLoadMode( gdcm::LD_NOSEQ );
    f->SetFileName( fileName );
    f->Load( );
 

diff --git a/Example/exSerieHelper.cxx b/Example/exSerieHelper.cxx
index 41a98abd3e135cce57c3f6ddc11e84d159519435..8a1de409aafb982cb32f609c2ba2ba5d4aa8b353 100644 (file)
--- a/Example/exSerieHelper.cxx
+++ b/Example/exSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:28 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/08/30 15:13:06 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
    std::cout << "Dir Name :[" << dirName << "]" << std::endl;
 
    s = new gdcm::SerieHelper();
-   s->SetLoadMode(GDCM_LD_ALL);     // Load everything for each File
+   s->SetLoadMode(gdcm::LD_ALL);     // Load everything for each File
    //s->AddRestriction(tagKey, valueToCheck); // Keep only files where
                                               // restriction is true
    s->SetDirectory(dirName, true); // true : recursive exploration

diff --git a/Testing/TestAllPrint.cxx b/Testing/TestAllPrint.cxx
index 833516ca9a4c78ef8c2c0d1b6b356b9904cd0171..3962137b3a4d3b3d1ade514fa56cc444a1db8d67 100644 (file)
--- a/Testing/TestAllPrint.cxx
+++ b/Testing/TestAllPrint.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllPrint.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/08/30 15:13:07 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ int TestAllPrint(int, char *[])
       std::string filename = gdcmDataImages[i];
 
       gdcm::File file;
-      file.SetLoadMode( GDCM_LD_NOSEQ );
+      file.SetLoadMode( gdcm::LD_NOSEQ );
       file.SetFileName( filename );
       file.Load();
       //file.Print( std::cout ); //just for debug

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 72ee3cc765b1c32bb2f2768a2bc99011795b6a0f..7a7ab5c6f4f79ba630bb947d523798702d42d610 100644 (file)
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.46 $
+  Date:      $Date: 2005/08/30 15:13:07 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -399,7 +399,7 @@ int InternalTest(std::string const &filename,
 
        // new style 
       gdcm::File *f = new gdcm::File();
-      f->SetLoadMode ( GDCM_LD_ALL ); // Load everything
+      f->SetLoadMode ( gdcm::LD_ALL ); // Load everything
       f->SetFileName( filename );
       f->Load();
  

diff --git a/Testing/TestMakeDicomDir.cxx b/Testing/TestMakeDicomDir.cxx
index d42e8741ca30a3df3dea81cccc29ce5f9d8cd270..695e230786805ea4be8b201a9d031a1497742eaf 100644 (file)
--- a/Testing/TestMakeDicomDir.cxx
+++ b/Testing/TestMakeDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestMakeDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/08/30 15:13:07 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -64,9 +64,9 @@ int TestMakeDicomDir(int argc, char *argv[])
    // new style (user is allowed no to load Sequences an/or Shadow Groups)
    dcmdir = new gdcm::DicomDir( );
  
-   // dcmdir->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW);
+   // dcmdir->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
    // some images have a wrong length for element 0x0000 of private groups
-   dcmdir->SetLoadMode(GDCM_LD_NOSEQ);
+   dcmdir->SetLoadMode(gdcm::LD_NOSEQ);
    dcmdir->SetDirectoryName(dirName);
    dcmdir->Load( );
 

diff --git a/Testing/TestSerieHelper.cxx b/Testing/TestSerieHelper.cxx
index 291d5c41a4465de324b323bf507d6f7fd559e1b7..f3a101a0916034f47bde5d91f35aa2254b0d5644 100644 (file)
--- a/Testing/TestSerieHelper.cxx
+++ b/Testing/TestSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/08/30 15:13:07 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ int TestSerieHelper(int argc, char *argv[])
    std::cout << "Dir Name :[" << dirName << "]" << std::endl;
 
    s = new gdcm::SerieHelper();
-   s->SetLoadMode(GDCM_LD_ALL);     // Load everything for each File
+   s->SetLoadMode(gdcm::LD_ALL);     // Load everything for each File
    //s->AddRestriction(tagKey, valueToCheck); // Keep only files where
                                               // restriction is true
    s->SetDirectory(dirName, true); // true : recursive exploration

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 46f4e85b1042fe2f78a69bb20d6555b547498cb1..47a0dcf3605c796d32522211b65be82729a57595 100644 (file)
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/08/30 15:13:07 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -250,11 +250,11 @@ int WriteSimple(Image &img)
    reread->SetFileName( fileName.str() );
    reread->SetLoadMode(0); // Load everything
                            // Other possible values are 
-                           //              GDCM_LD_ALL, 
-                           //              GDCM_LD_NOSEQ, 
-                           //              GDCM_LD_NOSHADOW,
-                           //              GDCM_LD_NOSEQ|GDCM_LD_NOSHADOW, 
-                           //              GDCM_LD_NOSHADOWSEQ
+                           //              gdcm::LD_ALL, 
+                           //              gdcm::LD_NOSEQ, 
+                           //              gdcm::LD_NOSHADOW,
+                           //              gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW, 
+                           //              gdcm::LD_NOSHADOWSEQ
    reread->Load();
 
    if( !reread->GetFile()->IsReadable() )

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 6b0330cdbf955cc55eab3755d73d6184ff493d68..a6e031d4c2bd5ae56efe43f0820f726665abcfe2 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:32 $
-  Version:   $Revision: 1.87 $
+  Date:      $Date: 2005/08/30 15:13:09 $
+  Version:   $Revision: 1.88 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -197,20 +197,15 @@ enum CompOperators {
    GDCM_LESSOREQUAL
 };
 
-// Loading mode
-#define GDCM_LD_ALL         0x00000000
-#define GDCM_LD_NOSEQ       0x00000001
-#define GDCM_LD_NOSHADOW    0x00000002
-#define GDCM_LD_NOSHADOWSEQ 0x00000004
-
+/// \brief Loading mode
 enum LodModeType
 {
-   LD_ALL         = GDCM_LD_ALL, // Load all
-   LD_NOSEQ       = GDCM_LD_NOSEQ, // Don't load odd groups
-   LD_NOSHADOW    = GDCM_LD_NOSHADOW, // Don't load Sequences
-   LD_NOSHADOWSEQ = GDCM_LD_NOSHADOWSEQ // Don't load Sequences if they belong 
-                                                   // to an odd group
-                                                   // (*exclusive* from LD_NOSEQ and LD_NOSHADOW)
+   LD_ALL         = 0x00000000, // Load all
+   LD_NOSEQ       = 0x00000001, // Don't load Sequences
+   LD_NOSHADOW    = 0x00000002, // Don't load odd groups
+   LD_NOSHADOWSEQ = 0x00000004  // Don't load Sequences if they belong 
+                                // to an odd group
+                                // (*exclusive* from LD_NOSEQ and LD_NOSHADOW)
 };
 
 /**

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 653a474434460d9db14acaa103fab679ee25645c..a7132a903e3901e2a536667c4078dbc844ed5d92 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:33 $
-  Version:   $Revision: 1.156 $
+  Date:      $Date: 2005/08/30 15:13:09 $
+  Version:   $Revision: 1.157 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -148,7 +148,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    // (nothing is cheked in Document constructor, to avoid overhead)
 
    ParseDir = parseDir;
-   SetLoadMode (GDCM_LD_ALL); // concerns only dicom files
+   SetLoadMode (LD_ALL); // concerns only dicom files
    SetFileName( fileName );
    Load( );
 }

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 51c8cbf86bd95d9e9d025bd3edda0e4eb365be79..5f40b723e6d3ed4d141162ca360b947af9b3d0b0 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:33 $
-  Version:   $Revision: 1.272 $
+  Date:      $Date: 2005/08/30 15:13:09 $
+  Version:   $Revision: 1.273 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,7 +63,7 @@ Document::Document()
    Group0002Parsed = false;
    IsDocumentAlreadyLoaded = false;
    IsDocumentModified = true;
-   LoadMode = GDCM_LD_ALL; // default : load everything, later
+   LoadMode = LD_ALL; // default : load everything, later
    SetFileName("");
 }
 
@@ -81,7 +81,7 @@ Document::Document( std::string const &fileName )
    SwapCode = 1234;
    Filetype = ExplicitVR;
    Group0002Parsed = false;
-   LoadMode = GDCM_LD_ALL; // Load everything, later
+   LoadMode = LD_ALL; // Load everything, later
 
    // Load will set it to true if sucessfull
    IsDocumentAlreadyLoaded = false;

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 51597358c097dcee5ff34b7bf24c16ad0c3ba973..bfad7be68b727295e8e94089e15ea8767027511e 100644 (file)
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:35 $
-  Version:   $Revision: 1.77 $
+  Date:      $Date: 2005/08/30 15:13:10 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,7 +69,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.77 $")
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.78 $")
 vtkStandardNewMacro(vtkGdcmReader)
 
 //-----------------------------------------------------------------------------
@@ -79,7 +79,7 @@ vtkGdcmReader::vtkGdcmReader()
    this->LookupTable = NULL;
    this->AllowLookupTable = false;
    this->AllowLightChecking = false;
-   this->LoadMode = GDCM_LD_ALL; // Load everything (possible values : 
+   this->LoadMode = gdcm::LD_ALL; // Load everything (possible values : 
                                  //  - LD_NOSEQ, 
                                  //  - LD_NOSHADOW,
                                  //  - LD_NOSHADOWSEQ)

diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx
index d925c518c0e1cb9a60e49cadd42fa95921a906ae..434d8c48511526fb45dec8d32e0fddae8709086a 100644 (file)
--- a/vtk/vtkgdcmSerieViewer.cxx
+++ b/vtk/vtkgdcmSerieViewer.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmSerieViewer.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:35 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/08/30 15:13:10 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -124,15 +124,15 @@ int main(int argc, char *argv[])
 
    char *dirName = am->ArgMgrWantString("dirname",usage);
 
-   int loadMode = GDCM_LD_ALL;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= GDCM_LD_NOSHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
       if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= GDCM_LD_NOSHADOW;
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= GDCM_LD_NOSEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    int reverse = am->ArgMgrDefined("reverse");

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 334d01810a181a5eb123579236cad8cfabe5dd0c..298747fceb0487c95548066f9202ff2e81996b04 100644 (file)
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:35 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/08/30 15:13:10 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
          reader->AddFileName( argv[i] );
 
 // TODO : allow user to choose Load Mode
-   reader->SetLoadMode(GDCM_LD_NOSHADOWSEQ);  
+   reader->SetLoadMode(gdcm::LD_NOSHADOWSEQ);  
    reader->Update();
 
    //print debug info:

diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx
index 7ddc82f82084d8f4a89dd6d01e72535da63c5020..4c499166ebc8247c6d01f2b0cde698558ea5939c 100644 (file)
--- a/vtk/vtkgdcmViewer2.cxx
+++ b/vtk/vtkgdcmViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:35 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/08/30 15:13:10 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
          reader->AddFileName( argv[i] );
 
 // TODO : allow user to choose Load Mode
-   reader->SetLoadMode(GDCM_LD_NOSHADOWSEQ);  
+   reader->SetLoadMode(gdcm::LD_NOSHADOWSEQ);  
    reader->Update();
 
    //print debug info: