From bba6b52311989034cfaca84d1ab1e492d94c1873 Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 30 Nov 2004 16:24:30 +0000 Subject: [PATCH] ENH: Apply patch from ITK back to main CVS. Fix problem with gcc2.95, we may need a dashboard to make sure nobody remove those include files again... --- gdcmConfigure.h.in | 2 +- src/CMakeLists.txt | 3 +++ src/gdcmBinEntry.cxx | 5 +++-- src/gdcmCommon.h | 43 ++++++++++++++++++------------------------- src/gdcmDocEntry.h | 5 +++-- src/gdcmDocEntrySet.h | 5 +++-- src/gdcmDocument.cxx | 10 +++++----- src/gdcmElementSet.h | 5 +++-- src/gdcmHeader.cxx | 6 +++--- src/gdcmSQItem.h | 5 +++-- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in index 84f19699..473e5bd1 100644 --- a/gdcmConfigure.h.in +++ b/gdcmConfigure.h.in @@ -22,7 +22,7 @@ #cmakedefine GDCM_NO_ANSI_STRING_STREAM /* I guess something important */ -#cmakedefine HAVE_NO_STDINT_H +#cmakedefine GDCM_HAVE_STDINT_H /* This variable allows you to have helpful debug statement */ /* That are in between #ifdef / endif in the gdcm code */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbdd6693..999a933e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ #----------------------------------------------------------------------------- +# Rebuild gdcm whenever a file starting with gdcm* is modified +INCLUDE_REGULAR_EXPRESSION("^gdcm.*$") + # Build jpeg lib first: SUBDIRS(gdcmjpeg) diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index d92bf991..2b0bc0ef 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:10 $ - Version: $Revision: 1.39 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.40 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,7 @@ #include "gdcmBinEntry.h" #include "gdcmDebug.h" #include +#include // for std::ios_base, since does not exist on gcc/Solaris namespace gdcm { diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 62a71b72..771a9e29 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/09 21:55:55 $ - Version: $Revision: 1.39 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.40 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,19 +45,25 @@ #endif //_MSC_VER //----------------------------------------------------------------------------- -#ifdef __GNUC__ -#ifndef HAVE_NO_STDINT_H +// ifdef for old gcc compiler +#ifdef GDCM_NO_ANSI_STRING_STREAM +# include +# define ostringstream ostrstream +# else +# include +#endif + +#include +#include + +#ifdef GDCM_HAVE_STDINT_H #include // For uint8_t uint16_t and uint32_t -#else -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#define UINT32_MAX (4294967295U) -#endif //HAVE_NO_STDINT_H #endif -#if defined( _MSC_VER) || defined(__BORLANDC__) +namespace gdcm +{ + +#ifndef GDCM_HAVE_STDINT_H typedef signed char int8_t; typedef unsigned char uint8_t; typedef unsigned short uint16_t; @@ -75,19 +81,6 @@ typedef unsigned int uint32_t; #define getcwd _getcwd #endif -// ifdef for old gcc / broken compiler -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - -#include -#include - -namespace gdcm -{ // Centralize information about the gdcm dictionary in only one file: #ifndef PUB_DICT_PATH diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index d6d3a5b6..7373c728 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.h,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.30 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.31 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,7 @@ #include "gdcmDictEntry.h" #include +#include class Header; class ValEntry; diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 32bf2ef4..5431412c 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.24 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.25 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,6 +20,7 @@ #define GDCMDOCENTRYSET_H #include "gdcmException.h" +#include namespace gdcm { diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index a26f291e..92ee5d3c 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/11/26 10:55:04 $ - Version: $Revision: 1.142 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.143 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -74,7 +74,7 @@ static const char *TransferSyntaxStrings[] = { //----------------------------------------------------------------------------- // Refer to Document::CheckSwap() -const unsigned int Document::HEADER_LENGTH_TO_READ = 256; +//const unsigned int Document::HEADER_LENGTH_TO_READ = 256; // Refer to Document::SetMaxSizeLoadEntry() const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096 @@ -2419,7 +2419,7 @@ bool Document::CheckSwap() uint32_t s32; uint16_t s16; - char deb[256]; //HEADER_LENGTH_TO_READ]; + char deb[256]; // First, compare HostByteOrder and NetworkByteOrder in order to // determine if we shall need to swap bytes (i.e. the Endian type). @@ -2434,7 +2434,7 @@ bool Document::CheckSwap() // The easiest case is the one of a DICOM header, since it possesses a // file preamble where it suffice to look for the string "DICM". - Fp->read(deb, HEADER_LENGTH_TO_READ); + Fp->read(deb, 256); char *entCur = deb + 128; if( memcmp(entCur, "DICM", (size_t)4) == 0 ) diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h index 6e96cb77..2d1529cb 100644 --- a/src/gdcmElementSet.h +++ b/src/gdcmElementSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.h,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.24 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.25 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,6 +23,7 @@ #include "gdcmDocEntrySet.h" #include #include +#include class ValEntry; class BinEntry; diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 2ccd0ac1..c46ddb0f 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2004/11/26 10:55:04 $ - Version: $Revision: 1.208 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.209 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,7 +22,7 @@ #include "gdcmDebug.h" #include "gdcmTS.h" #include "gdcmValEntry.h" -#include +#include //sscanf #include diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index 96ec2d3d..be859498 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.23 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,6 +22,7 @@ #include "gdcmElementSet.h" #include +#include namespace gdcm { -- 2.45.1