X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=4a2e2c0e403e5dfdc13b395583a6e5903c086168;hb=986a43287516de55e51b476572366c85e9fa2b8d;hp=26ded6d39b3c440f619d9c68ca50a5cd4748bcf2;hpb=3a9e9df62b3198c4f93d1768074b6be828ac7308;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 26ded6d3..4a2e2c0e 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/04/05 10:56:25 $ - Version: $Revision: 1.63 $ + Date: $Date: 2005/06/25 13:57:29 $ + Version: $Revision: 1.66 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,7 +57,7 @@ #endif // Broken plateform do not respect C99 and do not provide those typedef -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -88,7 +88,7 @@ namespace gdcm # define PUB_DICT_PATH "../Dicts/" #endif #define PUB_DICT_NAME "DicomV3Dict" -#define PUB_DICT_FILENAME "dicomV3.dic" +#define PUB_DICT_FILENAME "gdcm.dic" #define DICT_ELEM "DicomDir.dic" #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" @@ -151,7 +151,7 @@ enum DicomDirType { /** * \brief structure, for internal use only */ -GDCM_EXPORT typedef struct +struct Element { /// DicomGroup number unsigned short int Group; @@ -159,7 +159,7 @@ GDCM_EXPORT typedef struct unsigned short int Elem; /// value (coded as a std::string) of the Element std::string Value; -} Element; +}; } //namespace gdcm //-----------------------------------------------------------------------------