From 7840ddd7d30ebe6f20959ff3ae9e0565f723c645 Mon Sep 17 00:00:00 2001 From: jpr Date: Tue, 24 May 2005 09:14:09 +0000 Subject: [PATCH] Typo --- src/CMakeLists.txt | 4 ++-- src/gdcmDocEntryArchive.cxx | 6 ++--- .../libjasper/include/jasper/jas_config.h.in | 23 ++++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bd4a11ba..40e84c54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,8 +12,8 @@ IF (WIN32) ENDIF (WIN32) SUBDIRS( gdcmjpeg - # gdcmmpeg2 - # gdcmjasper + #gdcmmpeg2 + #gdcmjasper ) # "jpeglib.h" is defined here: diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx index 27aa83d9..43b02739 100644 --- a/src/gdcmDocEntryArchive.cxx +++ b/src/gdcmDocEntryArchive.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntryArchive.cxx,v $ Language: C++ - Date: $Date: 2005/02/21 17:47:19 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/05/24 09:14:09 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -78,7 +78,7 @@ bool DocEntryArchive::Push(DocEntry *newEntry) /** * \brief Removes out of the Header a DocEntry. - * It's kept in archive. + * (it's kept in archive). * @param group Group number of the Entry to remove * @param elem Element number of the Entry to remove * @return FALSE when an other DocEntry is already archived with the same key diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in index 34170d4a..22707890 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in @@ -182,21 +182,22 @@ typedef unsigned int uint; typedef unsigned long ulong; typedef long long longlong; typedef unsigned long long ulonglong; -/*#define ssize_t int */ +/* #define ssize_t int */ #endif - -/* Copied from gdcmCommon.h */ -/* hope it works ... */ -/* Broken plateform do not respect C99 and do not provide those typedef */ +/* Something I don't uderstand (neither Benoit does ...) + The previous 'ifndef' caises warning with gcc, like : + /usr/include/sys/types.h:152: warning: `ushort' previously declared here + Commenting it out and uncommenting the following causes syntax error ?!? +*/ /* #if defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; +typedef unsigned char uchar; +typedef unsigned short ushort; +typedef unsigned int uint; +typedef unsigned long ulong; +typedef long long longlong; +typedef unsigned long long ulonglong; #define UINT32_MAX (4294967295U) #endif */ -- 2.48.1