From: regrain Date: Wed, 24 Sep 2003 14:45:02 +0000 (+0000) Subject: Remaining etc... replaced by ... X-Git-Tag: Version0.3.1~144 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=412e45113080662e115ad6a5771ae607fab2e7ea;p=gdcm.git Remaining etc... replaced by ... Now it compiles under RehHat 9 --- diff --git a/src/config.h b/src/config.h index 52353876..c5fdb3d4 100644 --- a/src/config.h +++ b/src/config.h @@ -1,43 +1,84 @@ -/* src/config.h. Generated automatically by configure. */ -/* src/config.h.in. Generated automatically from configure.in by autoheader. */ +/* src/config.h. Generated by configure. */ +/* src/config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 -/* Define if your declares struct tm. */ -/* #undef TM_IN_SYS_TIME */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE "gdcm" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* The number of bytes in a char. */ +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 -/* The number of bytes in a int. */ +/* The size of a `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The number of bytes in a long. */ +/* The size of a `long', as computed by sizeof. */ #define SIZEOF_LONG 4 -/* The number of bytes in a long long. */ +/* The size of a `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 -/* The number of bytes in a short. */ +/* The size of a `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -/* Define if you have the header file. */ -#define HAVE_DLFCN_H 1 +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* Name of package */ -#define PACKAGE "gdcm" +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ /* Version number of package */ #define VERSION "0.3.0" +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ diff --git a/src/config.h.in b/src/config.h.in index 552bf6bc..5a0d619b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,42 +1,83 @@ -/* src/config.h.in. Generated automatically from configure.in by autoheader. */ +/* src/config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -#undef const +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H -/* Define to `unsigned' if doesn't define. */ -#undef size_t +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H -/* Define if your declares struct tm. */ -#undef TM_IN_SYS_TIME +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* The number of bytes in a char. */ +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* The size of a `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The number of bytes in a int. */ +/* The size of a `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The number of bytes in a long. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The number of bytes in a long long. */ +/* The size of a `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG -/* The number of bytes in a short. */ +/* The size of a `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Name of package */ -#undef PACKAGE +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME /* Version number of package */ #undef VERSION +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx index 2dd8e846..7f877388 100644 --- a/src/gdcmElValSet.cxx +++ b/src/gdcmElValSet.cxx @@ -388,12 +388,12 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) { guint32 val_uint32; guint16 val_uint16; - vector tokens; + std::vector tokens; void *ptr; // Tout ceci ne marche QUE parce qu'on est sur un proc Little Endian - // restent à tester les echecs en écriture (apres chaque fwrite) + // restent à tester les echecs en écriture (apres chaque fwrite) for (TagElValueHT::iterator tag2=tagHt.begin(); tag2 != tagHt.end(); diff --git a/src/gdcmHeaderIdo.cxx b/src/gdcmHeaderIdo.cxx index 71a1d123..4c75ba78 100644 --- a/src/gdcmHeaderIdo.cxx +++ b/src/gdcmHeaderIdo.cxx @@ -29,7 +29,7 @@ void gdcmHeaderIdo::BuildHeader(void) { * filetype. */ void gdcmHeaderIdo::setAcrLibido(void) { - string RecCode; + std::string RecCode; RecCode = GetPubElValByNumber(0x0008, 0x0010); if (RecCode == "ACRNEMA_LIBIDO" || diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx index 213ab4df..3a0f2ed0 100644 --- a/src/gdcmRLE.cxx +++ b/src/gdcmRLE.cxx @@ -37,7 +37,7 @@ static int _gdcm_read_RLE_fragment (char ** image_buffer, int gdcmFile::gdcm_read_RLE_file (void * image_buffer) { char * im = (char *)image_buffer; - cout << "RLE image" << std::endl; + std::cout << "RLE image" << std::endl; long RleSegmentLength[15],fragmentLength,uncompressedSegmentSize;; long ftellRes, ln;