Fix trouble with BCC

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index aa3e9aa25dee0e4732110ba71f44048665a1b9ff..98eee44ad8f308c730311ff168e9a89668f1a733 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: 2006/03/17 14:31:43 $
-  Version:   $Revision: 1.108 $
+  Date:      $Date: 2006/05/31 16:02:32 $
+  Version:   $Revision: 1.111 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,7 +22,7 @@
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
 #include "gdcmMacro.h"
-
+#include "gdcmVRKey.h"
 #include <string>
 
 //-----------------------------------------------------------------------------
@@ -36,6 +36,10 @@
   #define GDCM_EXPORT
 #endif
 
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
 //-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
@@ -45,7 +49,10 @@ namespace gdcm
 #ifndef PUB_DICT_PATH
 #  define PUB_DICT_PATH   "../Dicts/"
 #endif
-#define PUB_DICT_NAME     "DicomV3Dict"
+#define PUB_DICT_NAME     "dicomV3Dict"
+// dicomV3.dic replaced by the generated gdcm.dic/
+// if gdcm.dic not found, method FillDefaultDataDict() is invoked
+//#define PUB_DICT_FILENAME "dicomV3.dic"
 #define PUB_DICT_FILENAME "gdcm.dic"
 #define DICT_ELEM         "DicomDir.dic"
 #define DICT_TS           "dicomTS.dic"
@@ -157,6 +164,8 @@ struct DicomElement
    unsigned short int Group;
    /// Dicom Element number
    unsigned short int Elem;
+   /// Value Representation
+   VRKey VR;
    /// value (coded as a std::string) of the Element
    std::string Value;
 };