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

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index c66ad0d5..27c4e90a 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/08/22 15:38:05 $
-  Version:   $Revision: 1.85 $
+  Date:      $Date: 2005/10/18 09:17:08 $
+  Version:   $Revision: 1.94 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,83 +20,7 @@
 #define GDCMCOMMON_H
 
 #include "gdcmConfigure.h"
-
-//-----------------------------------------------------------------------------
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// '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 )
-//'identifier' : decorated name length exceeded, name was truncated
-#pragma warning ( disable : 4503 )
-// C++ exception specification ignored except to indicate a 
-// function is not __declspec(nothrow)
-#pragma warning ( disable : 4290 )
-// signed/unsigned mismatch
-#pragma warning ( disable : 4018 )
-// return type for 'identifier' is '' (ie; not a UDT or reference to UDT. Will
-// produce errors if applied using infix notation
-#pragma warning ( disable : 4284 )
-// 'type' : forcing value to bool 'true' or 'false' (performance warning)
-// //#pragma warning ( disable : 4800 )
-#endif //_MSC_VER
-
-//-----------------------------------------------------------------------------
-#ifdef CMAKE_HAVE_STDINT_H
-   #include <stdint.h>
-#else
-#ifdef CMAKE_HAVE_INTTYPES_H
-   // Old system only have this
-   #include <inttypes.h>   // For uint8_t uint16_t and uint32_t
-#else
-// Broken plateform do not respect C99 and do not provide those typedef
-// Special case for recent borland compiler, comes with stdint.h
-#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  || defined(__MINGW32__)
-typedef  signed char         int8_t;
-typedef  signed short        int16_t;
-typedef  signed int          int32_t;
-typedef  unsigned char       uint8_t;
-typedef  unsigned short      uint16_t;
-typedef  unsigned int        uint32_t;
-#else
-#error "Sorry your plateform is not supported"
-#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  || defined(__MINGW32__)
-#endif // CMAKE_HAVE_INTTYPES_H
-#endif // CMAKE_HAVE_STDINT_H
-
-// Basically for VS6 and bcc 5.5.1:
-#ifndef UINT32_MAX
-#define UINT32_MAX    (4294967295U)
-#endif
-
-#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
-
-#include <string>
-#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
-
+#include "gdcmSystem.h"
 
 //-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
@@ -119,9 +43,10 @@ GDCM_EXPORT extern const std::string GDCM_UNFOUND;
 GDCM_EXPORT extern const std::string GDCM_BINLOADED;
 GDCM_EXPORT extern const std::string GDCM_NOTLOADED;
 GDCM_EXPORT extern const std::string GDCM_UNREAD;
-
-/// \brief TagKey is made to hold the standard Dicom Tag (Group number, Element
-/// number)
+GDCM_EXPORT extern const std::string GDCM_NOTASCII;
+GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
+/// \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
 /// converted into a string (e.g. 0x0018,0x0050 converted into "0018|0050")
 /// It appears to be a huge waste of time.
@@ -166,8 +91,12 @@ inline std::ostream& operator<<(std::ostream& _O, std::string _val)
   return _O << _val.c_str();
 }
 #endif
+
+/// \brief TagName is made to hold the 'non hexa" fields (VR, VM, Name) 
+///        of Dicom Entries
 typedef std::string TagName;
 
+/// \brief various types of a DICOM file (for internal use only)
 enum FileType {
    Unknown = 0,
    ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !...
@@ -187,7 +116,7 @@ enum DicomDirType {
    DD_VISIT
 };
 
-/// \brief comparaison operators 
+/// \brief comparison operators (as used in SerieHelper::AddRestriction() )
 enum CompOperators {
    GDCM_EQUAL = 0,
    GDCM_DIFFERENT,
@@ -196,6 +125,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
  */