Remaining etc... replaced by ...

Now it compiles under RehHat 9

diff --git a/src/config.h b/src/config.h
index 5235387619dd8b995b2eaa9741cb74cff800c99a..c5fdb3d4c96ed9fda47831279b318eb106ad8af3 100644 (file)
--- 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 <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define to 1 if you have the <inttypes.h> 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 <memory.h> header file. */
+#define HAVE_MEMORY_H 1
 
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #undef TM_IN_SYS_TIME */
+/* Define to 1 if you have the <stdint.h> 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 <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> 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 <dlfcn.h> 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 <sys/time.h> 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 <sys/types.h> does not define. */
+/* #undef size_t */

diff --git a/src/config.h.in b/src/config.h.in
index 552bf6bca1ef57a43305a20a6569e0d1ac15a39e..5a0d619bd4b7cb87fa7d1b4003ed368d8c18b5b5 100644 (file)
--- 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 <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
+/* Define to 1 if you have the <inttypes.h> 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 <memory.h> header file. */
+#undef HAVE_MEMORY_H
 
-/* Define if your <sys/time.h> declares struct tm.  */
-#undef TM_IN_SYS_TIME
+/* Define to 1 if you have the <stdint.h> 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 <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> 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 <dlfcn.h> 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 <sys/time.h> 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 <sys/types.h> does not define. */
+#undef size_t

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 2dd8e846292b80e448505b274fb0331ef8103ce1..7f8773882786efbcfbe381dbbe500408a6569d5c 100644 (file)
--- 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<std::string> tokens;
+   std::vector<std::string> 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 71a1d123f0ccf4c783d670cc82e475290bfd770e..4c75ba7873a96db1592e6b9c34635e832c79c8ff 100644 (file)
--- 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 213ab4df48956cc696bb3723004c0ddf88d9ecdd..3a0f2ed0ab2581cd496dac496ce2ff783be8304a 100644 (file)
--- 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;