X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=2eaca042ef662838da4d3af06aa3ee812c9c39e8;hb=c1e76b5446c340a4b2df46cabedeab2d71bd45f8;hp=0af21208d3643698614776e408519bed1d07d5fb;hpb=e037a39af09b4df452992e1129fa2a370171c44e;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 0af21208..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 @@ -45,7 +56,7 @@ typedef unsigned short guint16; typedef unsigned int guint32; typedef short gint16; -typedef int gint32; +typedef int gint32; #define UINT32_MAX (4294967295U) #endif //HAVE_NO_STDINT_H #endif @@ -53,7 +64,7 @@ typedef int gint32; #ifdef _MSC_VER typedef unsigned short guint16; typedef unsigned int guint32; -typedef short gint16; +typedef short gint16; typedef int gint32; #define UINT32_MAX (4294967295U) #endif @@ -86,17 +97,17 @@ typedef int gint32; #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 is in this case - ImplicitVR, - ACR, - ACR_LIBIDO + gdcmUnknown = 0, + gdcmExplicitVR, // gdcmDicomDir is in this case + gdcmImplicitVR, + gdcmACR, + gdcmACR_LIBIDO }; //-----------------------------------------------------------------------------