X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=f5846edd3dd8c5808aeba27cb718c68e22e5f07a;hb=1f9855840e616065eb9ef1b99f69680541b68aad;hp=85c63a55508c1146d1e04ae68001cc9cfabcbae2;hpb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 85c63a55..f5846edd 100644
--- 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/19 12:01:50 $
-  Version:   $Revision: 1.98 $
+  Date:      $Date: 2006/01/24 19:58:13 $
+  Version:   $Revision: 1.104 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,23 +21,10 @@
 
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
+#include "gdcmMacro.h"
 
 #include <string>
 
-//-----------------------------------------------------------------------------
-// TagKey definition
-#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
-
 //-----------------------------------------------------------------------------
 #if defined(_WIN32) && defined(BUILD_SHARED_LIBS)
   #ifdef gdcm_EXPORTS
@@ -75,6 +62,8 @@ GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
 
 GDCM_EXPORT extern const std::string GDCM_VRUNKNOWN;
 
+GDCM_EXPORT extern const char GDCM_FILESEPARATOR;
+
 /// \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
@@ -83,37 +72,6 @@ GDCM_EXPORT extern const std::string GDCM_VRUNKNOWN;
 /// We'll fix the mess up -without any change in the API- as soon as the bench
 /// marks are fully performed.
 
-#if FASTTAGKEY
-typedef union   {
-      uint16_t  tab[2];
-      uint32_t  tagkey;
-    } TagKey;
-/* 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);
-}
-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
-   // 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;
-#endif
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
 // Doing everything within gdcm namespace to avoid polluting 3d party software
 inline std::ostream& operator<<(std::ostream& _O, std::string _val)
@@ -173,9 +131,9 @@ enum LodModeType
  */  
 struct DicomElement
 {
-   /// DicomGroup number
+   /// Dicom Group number
    unsigned short int Group;
-   /// DicomElement number
+   /// Dicom Element number
    unsigned short int Elem;
    /// value (coded as a std::string) of the Element
    std::string Value;