* Correctly use the VRKey for all vr variables... instead of TagName

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 27c4e90a3c5aba8f991457b49fdc185ae67cfe6f..b6fdd0bf9ceeb0884637acde04920ece476ac75c 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/10/18 09:17:08 $
-  Version:   $Revision: 1.94 $
+  Date:      $Date: 2005/10/18 12:58:27 $
+  Version:   $Revision: 1.95 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,18 @@
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
 
+#define FASTTAGKEY 0
+
+// FIXME: Should rewrite this:
+#if FASTTAGKEY
+   #include <iostream>
+   #include <iomanip>
+#endif
+   #if defined(_MSC_VER) && (_MSC_VER == 1200)
+   /* ostream operator for std::string since VS6 does not provide it*/
+      #include <iostream>
+#endif
+
 //-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
@@ -45,6 +57,9 @@ GDCM_EXPORT extern const std::string GDCM_NOTLOADED;
 GDCM_EXPORT extern const std::string GDCM_UNREAD;
 GDCM_EXPORT extern const std::string GDCM_NOTASCII;
 GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
+
+GDCM_EXPORT extern const std::string GDCM_VRUNKNOWN;
+
 /// \brief TagKey is made to hold the standard Dicom Tag 
 ///               (Group number, Element number)
 /// Instead of using the two '16 bits integers' as the Hask Table key, we
@@ -61,25 +76,25 @@ typedef union   {
 /* ostream operator for TagKey */
 inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
 {
-  _O.setf( std::ios::right);
-  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);
+   _O.setf( std::ios::right);
+   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;
+   return _self.tagkey == _val.tagkey;
 }
 inline bool operator<(TagKey _self, TagKey _val)
 {
-  // This expression is a tad faster but PrintFile output
-  // is more difficult to read
-  //return _self.tagkey < _val.tagkey;
-
-  // More usal order of dicom tags:
-  if( _self.tab[0] == _val.tab[0] )
-    return _self.tab[1] < _val.tab[1];
-  return _self.tab[0] < _val.tab[0];
+   // This expression is a tad faster but PrintFile output
+   // is more difficult to read
+   //return _self.tagkey < _val.tagkey;
+
+   // More usal order of dicom tags:
+   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;