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

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index c2a238506cc6a5ab3c3abc37fbd3a170a8cb53db..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/07/18 10:20:20 $
-  Version:   $Revision: 1.81 $
+  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
@@ -97,6 +97,8 @@ typedef  unsigned int        uint32_t;
 #include <iostream>
 #endif
 
+
+//-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
 {
@@ -138,11 +140,11 @@ inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
   return (_O << std::hex << std::setw( 4 ) << std::setfill( '0' )
      << _val.tab[0] << '|' << std::setw( 4 ) << std::setfill( '0' )
      << _val.tab[1] << std::setfill( ' ' ) << std::dec);
-};
+}
 inline bool operator==(TagKey _self, TagKey _val)
 {
   return _self.tagkey == _val.tagkey;
-};
+}
 inline bool operator<(TagKey _self, TagKey _val)
 {
   // This expression is a tad faster but PrintFile output
@@ -153,7 +155,7 @@ inline bool operator<(TagKey _self, TagKey _val)
   if( _self.tab[0] == _val.tab[0] )
     return _self.tab[1] < _val.tab[1];
   return _self.tab[0] < _val.tab[0];
-};
+}
 #else
 typedef std::string TagKey;
 #endif
@@ -162,7 +164,7 @@ typedef std::string TagKey;
 inline std::ostream& operator<<(std::ostream& _O, std::string _val)
 {
   return _O << _val.c_str();
-};
+}
 #endif
 typedef std::string TagName;
 
@@ -185,7 +187,7 @@ enum DicomDirType {
    DD_VISIT
 };
 
-/// \brief comparaison operators 
+/// \brief comparison operators 
 enum CompOperators {
    GDCM_EQUAL = 0,
    GDCM_DIFFERENT,
@@ -194,6 +196,18 @@ enum CompOperators {
    GDCM_LESS,
    GDCM_LESSOREQUAL
 };
+
+/// \brief Loading mode
+enum LodModeType
+{
+   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)
+};
+
 /**
  * \brief structure, for internal use only
  */