From af94ab6719e309d3dd9730d5656057c429106938 Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 24 Sep 2003 16:18:32 +0000 Subject: [PATCH] Remove spurious tests --- src/config.h | 30 +++++++++++++++--------------- src/gdcmHeader.cxx | 9 ++++++--- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/config.h b/src/config.h index c5fdb3d4..aec099d7 100644 --- a/src/config.h +++ b/src/config.h @@ -1,53 +1,53 @@ -/* src/config.h. Generated by configure. */ +/* src/config.h. Generated automatically by configure. */ /* src/config.h.in. Generated from configure.in by autoheader. */ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 +/* #undef HAVE_INTTYPES_H */ /* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 +/* #undef HAVE_MEMORY_H */ /* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 +/* #undef HAVE_STDINT_H */ /* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* #undef HAVE_STDLIB_H */ /* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H */ /* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 +/* #undef HAVE_STRING_H */ /* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +/* #undef HAVE_SYS_STAT_H */ /* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 +/* #undef HAVE_SYS_TYPES_H */ /* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* #undef HAVE_UNISTD_H */ /* Name of package */ #define PACKAGE "gdcm" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +/* #undef PACKAGE_BUGREPORT */ /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +/* #undef PACKAGE_NAME */ /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +/* #undef PACKAGE_STRING */ /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +/* #undef PACKAGE_TARNAME */ /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +/* #undef PACKAGE_VERSION */ /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 51f36d75..c1d8c043 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -1,4 +1,4 @@ -// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.89 2003/09/24 13:52:46 jpr Exp $ +// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.90 2003/09/24 16:18:32 jpr Exp $ //This is needed when compiling in debug mode #ifdef _MSC_VER @@ -55,7 +55,10 @@ gdcmHeader::gdcmHeader(const char *InFilename, bool exception_on_error) { Initialise(); if ( !OpenFile(exception_on_error)) return; +printf ("avant ParseHeader\n"); ParseHeader(); +printf ("avant LoadElements\n"); + LoadElements(); CloseFile(); } @@ -1183,7 +1186,7 @@ gdcmElValue * gdcmHeader::ReadNextElement(void) { g = ReadInt16(); n = ReadInt16(); - if ( (g==0x7fe0) && (n==0x0010) ) + //if ( (g==0x7fe0) && (n==0x0010) ) if (errno == 1) // We reached the EOF (or an error occured) and header parsing @@ -1198,7 +1201,7 @@ gdcmElValue * gdcmHeader::ReadNextElement(void) { return (gdcmElValue *)0; } NewElVal->SetOffset(ftell(fp)); - if ( (g==0x7fe0) && (n==0x0010) ) + //if ( (g==0x7fe0) && (n==0x0010) ) return NewElVal; } -- 2.48.1