X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmCommon.h;h=e7875ede4d3f2f703ad6c0f6bc5aeb585eb69063;hb=bdc259a03a952468d01ec9b4581563548c393021;hp=27c4e90a3c5aba8f991457b49fdc185ae67cfe6f;hpb=4117dec671b980b51a16117a5692d822b63bbe04;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 27c4e90a..e7875ede 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/18 09:17:08 $
-  Version:   $Revision: 1.94 $
+  Date:      $Date: 2005/10/19 13:17:04 $
+  Version:   $Revision: 1.99 $
                                                                                 
   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,19 @@
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
 
+#include <string>
+
+//-----------------------------------------------------------------------------
+#if defined(_WIN32) && defined(BUILD_SHARED_LIBS)
+  #ifdef gdcm_EXPORTS
+    #define GDCM_EXPORT __declspec( dllexport )
+  #else
+    #define GDCM_EXPORT __declspec( dllimport )
+  #endif
+#else
+  #define GDCM_EXPORT
+#endif
+
 //-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
@@ -45,6 +58,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
@@ -53,37 +69,6 @@ GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
 /// 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)
@@ -102,7 +87,8 @@ enum FileType {
    ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !...
    ImplicitVR,
    ACR,
-   ACR_LIBIDO
+   ACR_LIBIDO,
+   JPEG
 };
 
 /// \brief type of the elements composing a DICOMDIR (for internal use only)
@@ -140,7 +126,7 @@ enum LodModeType
 /**
  * \brief structure, for internal use only
  */  
-struct Element
+struct DicomElement
 {
    /// DicomGroup number
    unsigned short int Group;