Begin of 'friend' classe hunting.

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index bbccb6b002dd482030a2ffcf8b867812899fd139..2d9f5f9e416114cbeec03d67fcd7fd55a32a82a4 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/01/10 19:23:31 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/01/20 17:15:53 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,7 +45,7 @@
 #endif //_MSC_VER
 
 //-----------------------------------------------------------------------------
-#ifdef GDCM_HAVE_STDINT_H
+#ifdef CMAKE_HAVE_STDINT_H
 #include <stdint.h>   // For uint8_t uint16_t and uint32_t
 #else
 #if defined(_MSC_VER) || defined(__BORLANDC__)
@@ -57,10 +57,14 @@ typedef  unsigned int   uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define GDCM_EXPORT __declspec( dllexport )
+#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
+  #define GDCM_EXPORT
 #endif
 
 #include <string>
@@ -78,39 +82,23 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-struct Dummy {};
-template<typename T>
-struct Strings_
-{
-    static std::string const UNKNOWN;
-    static std::string const UNFOUND;
-    static std::string const BINLOADED;
-    static std::string const NOTLOADED;
-    static std::string const UNREAD;
-};
-template<typename T> std::string const Strings_<T>::UNKNOWN   = "gdcm::Unknown";
-template<typename T> std::string const Strings_<T>::UNFOUND   = "gdcm::Unfound";
-template<typename T> std::string const Strings_<T>::BINLOADED = "gdcm::Binary data loaded";
-template<typename T> std::string const Strings_<T>::NOTLOADED = "gdcm::NotLoaded";
-template<typename T> std::string const Strings_<T>::UNREAD    = "gdcm::UnRead";
-typedef Strings_<Dummy> Strings;
-#define GDCM_UNKNOWN   Strings::UNKNOWN
-#define GDCM_UNFOUND   Strings::UNFOUND
-#define GDCM_BINLOADED Strings::BINLOADED
-#define GDCM_NOTLOADED Strings::NOTLOADED
-#define GDCM_UNREAD    Strings::UNREAD
+GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
+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 an "universal" (as in URL, Universal
 ///        Ressource Locator)  key to a DocEntry i.e. a dicom tag.
-///        A dicom tag always has a group and an element, but a set of tags
+///        A dicom tag always has a group and an elem, but a set of tags
 ///        embeded in various (optionally nested) sequences and sharing
-///        the same group and element all share the same (group, element)
-///        "identifier". Hence the (group, element) cannot be used as an
+///        the same group and elem all share the same (group, elem)
+///        "identifier". Hence the (group, elem) cannot be used as an
 ///        identifier (in gdcm we shall refer to a "TagKey") of a tag.
 ///        In order to construct a proper tag identifier (i.e. a key) we
 ///        consider the following definition of a TagKey:
 ///        - let Group, Element be the string representation of the
-///          group and element dicom tag members,
+///          group and elem dicom tag members,
 ///        - let ItemNumber be the string representation of the integer
 ///          index of the considered item number of a sequence,
 ///        Let the key of a tag embeded in a sequence, noted SeqTag, be
@@ -137,6 +125,15 @@ enum FileType {
    ACR,
    ACR_LIBIDO
 };
+
+enum DicomDirType {
+   DD_UNKNOWN = 0,
+   DD_META,
+   DD_PATIENT,
+   DD_STUDY,
+   DD_SERIE,
+   DD_IMAGE
+};
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif