X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=ee14309705264d3de7309b0f46a49458e66a92ff;hb=47d5f7773f491efc3f8d687bd0c8f128cb811eb3;hp=a51dd6603d2920aaa065f09e2b47f81bc0a2c88d;hpb=dd9001df5c1b8d5be917f635a6316aa4f0869af7;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index a51dd660..ee143097 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/01/30 17:30:57 $
-  Version:   $Revision: 1.59 $
+  Date:      $Date: 2005/05/27 18:37:28 $
+  Version:   $Revision: 1.65 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 // 'identifier' : class 'type' needs to have dll-interface to be used by
 // clients of class 'type2'
 #pragma warning ( disable : 4251 )
+// non dll-interface class 'type' used as base for dll-interface class 'type2'
+#pragma warning ( disable : 4275 )
 // 'identifier' : identifier was truncated to 'number' characters in the
 // debug information
 #pragma warning ( disable : 4786 )
@@ -55,7 +57,7 @@
 #endif
 
 // Broken plateform do not respect C99 and do not provide those typedef
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
 typedef  signed char         int8_t;
 typedef  signed short        int16_t;
 typedef  signed int          int32_t;
@@ -77,6 +79,7 @@ typedef  unsigned int        uint32_t;
 
 #include <string>
 
+/// \brief namespace for Grass root DiCoM
 namespace gdcm
 {
 
@@ -89,6 +92,7 @@ namespace gdcm
 #define DICT_ELEM         "DicomDir.dic"
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
+#define DICT_GROUP_NAME   "DictGroupName.dic"
 
 GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
 GDCM_EXPORT extern const std::string GDCM_UNFOUND;
@@ -123,7 +127,6 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD;
 ///        a sequence, itself nested in the third item of a sequence is the
 ///        string e.g.
 ///            0004|1220/2#0008|0082/0#0008|0090
-///        Probabely useless stuff.
 typedef std::string TagKey;
 typedef std::string TagName;
 
@@ -135,6 +138,7 @@ enum FileType {
    ACR_LIBIDO
 };
 
+/// \brief type of the elements composing a DICOMDIR (for internal use only)
 enum DicomDirType {
    DD_UNKNOWN = 0,
    DD_META,
@@ -144,6 +148,19 @@ enum DicomDirType {
    DD_IMAGE
 };
 
+/**
+ * \brief structure, for internal use only
+ */  
+struct Element
+{
+   /// DicomGroup number
+   unsigned short int Group;
+   /// DicomElement number
+   unsigned short int Elem;
+   /// value (coded as a std::string) of the Element
+   std::string Value;
+};
+
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif