Typo

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd4a11bac59e38e562cbea2158df1807b6bb82ba..40e84c549050dcc5ccf15144a8a79780413b07a3 100644 (file)
--- 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 27aa83d978e7f4aac02897942be8a7726914cc43..43b02739e5bd6e054e5f2ca9126bc09e8cb1a443 100644 (file)
--- 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 34170d4a5dafa9bcf868844f1f68e33310a6c8d0..2270789054812fb6ff7f1abca67ee826b6a33e17 100644 (file)
--- 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
 */