X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=98ff3901ec7b0c9181118d82356890b51d64c485;hb=224876ca6cbe71952f2a1d66d9853eca7745d3a0;hp=76d2dc4d791725d52384576ec8ea8d065b31083c;hpb=17ebda2271dd65565f512e835546b22c22ebbbb0;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 76d2dc4d..98ff3901 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.109 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.116 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMCOMMON_H
-#define GDCMCOMMON_H
+#ifndef _GDCMCOMMON_H_
+#define _GDCMCOMMON_H_
 
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
@@ -36,16 +36,30 @@
   #define GDCM_EXPORT
 #endif
 
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
 //-----------------------------------------------------------------------------
 /// \brief namespace for Grass root DiCoM
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 
 // Centralize information about the gdcm dictionary in only one file:
+//
+// ==>
+// ==> Don't forget gdcm/gdcmPython/gdcm.i
+// ==>
+//
+
 #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"
@@ -60,7 +74,7 @@ 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;
+GDCM_EXPORT extern const char GDCM_VRUNKNOWN[2];
 
 GDCM_EXPORT extern const char GDCM_FILESEPARATOR;
 
@@ -94,7 +108,8 @@ enum FileType {
    ACR_LIBIDO,
    /// \todo FIXME : an encapsulated JPEG file may be 
    ///              either ExplicitVR or ImplicitVR, right?
-   JPEG
+   JPEG,
+   JPEG2000
 };
 
 /// \brief type of the elements composing a DICOMDIR (for internal use only)