X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmCommon.h;h=2fb153918b4300c1ef995951ee0a0f423caa0cf4;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=771a9e29fa40ed0f6f532a4ff7ac0f9514a428d1;hpb=bba6b52311989034cfaca84d1ab1e492d94c1873;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 771a9e29..2fb15391 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2004/11/30 16:24:31 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/01/06 20:03:26 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -58,13 +58,10 @@ #ifdef GDCM_HAVE_STDINT_H #include // For uint8_t uint16_t and uint32_t +#else +#if defined(_MSC_VER) || defined(__BORLANDC__) +typedef signed char int8_t; #endif - -namespace gdcm -{ - -#ifndef GDCM_HAVE_STDINT_H -typedef signed char int8_t; typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -77,10 +74,8 @@ typedef unsigned int uint32_t; #define GDCM_EXPORT #endif -#ifdef _MSC_VER -#define getcwd _getcwd -#endif - +namespace gdcm +{ // Centralize information about the gdcm dictionary in only one file: #ifndef PUB_DICT_PATH @@ -92,6 +87,7 @@ typedef unsigned int uint32_t; #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" +const std::string GDCM_UNKNOWN = "gdcm::Unknown"; const std::string GDCM_UNFOUND = "gdcm::Unfound"; const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";