X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmCommon.h;h=2eaca042ef662838da4d3af06aa3ee812c9c39e8;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=2b42c8cde613eb9e527d62b478a03e7da1b6e805;hpb=8b0d3c6c373474dc31af9eb56cf949298a723a76;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 2b42c8cd..2eaca042 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -1,5 +1,21 @@ -//gdcmCommon.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmCommon.h,v $ + Language: C++ + Date: $Date: 2004/06/20 18:08:47 $ + Version: $Revision: 1.27 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMCOMMON_H #define GDCMCOMMON_H @@ -31,12 +47,7 @@ //----------------------------------------------------------------------------- #ifdef __GNUC__ #ifndef HAVE_NO_STDINT_H -//#if defined __STDC_LIMIT_MACROS -//#endif #include -//#ifdef UINT32_MAX -//#error hehrehhehehehe2 -//#endif #define guint16 uint16_t #define guint32 uint32_t #define gint16 int16_t @@ -44,8 +55,8 @@ #else typedef unsigned short guint16; typedef unsigned int guint32; -typedef short gint16; -typedef int gint32; +typedef short gint16; +typedef int gint32; #define UINT32_MAX (4294967295U) #endif //HAVE_NO_STDINT_H #endif @@ -53,8 +64,8 @@ typedef int gint32; #ifdef _MSC_VER typedef unsigned short guint16; typedef unsigned int guint32; -typedef short gint16; -typedef int gint32; +typedef short gint16; +typedef int gint32; #define UINT32_MAX (4294967295U) #endif @@ -76,27 +87,27 @@ typedef int gint32; // Centralize information about the gdcm dictionary in only one file: #ifndef PUB_DICT_PATH -# define PUB_DICT_PATH "../Dicts/" +# define PUB_DICT_PATH "../Dicts/" #endif #define PUB_DICT_NAME "DicomV3Dict" #define PUB_DICT_FILENAME "dicomV3.dic" -#define DICT_ELEM "DicomDir.dic" -#define DICT_TS "dicomTS.dic" -#define DICT_VR "dicomVR.dic" +#define DICT_ELEM "DicomDir.dic" +#define DICT_TS "dicomTS.dic" +#define DICT_VR "dicomVR.dic" #include -const std::string GDCM_UNFOUND = "gdcm::Unfound"; +const std::string GDCM_UNFOUND = "gdcm::Unfound"; /// MEMORY LEAK typedef std::string TagKey; typedef std::string TagName; enum FileType { - Unknown = 0, - ExplicitVR, // gdcmDicomDir are in this case - ImplicitVR, - ACR, - ACR_LIBIDO + gdcmUnknown = 0, + gdcmExplicitVR, // gdcmDicomDir is in this case + gdcmImplicitVR, + gdcmACR, + gdcmACR_LIBIDO }; //-----------------------------------------------------------------------------