From: malaterre <malaterre>
Date: Thu, 10 Apr 2008 12:15:34 +0000 (+0000)
Subject: COMP: fix comp on gcc 4.3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5b6a7b2ed61205e0b2a80a7fa4878976a78edf15;p=gdcm.git

COMP: fix comp on gcc 4.3
---

diff --git a/Testing/TestInline.cxx b/Testing/TestInline.cxx
index e6535c5c..b427e37f 100755
--- a/Testing/TestInline.cxx
+++ b/Testing/TestInline.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestInline.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/13 19:08:34 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/04/10 12:15:34 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,11 +31,11 @@
 
 #include "gdcmUtil.h"
 
+#include <stdlib.h> // atoi
 #if defined(__BORLANDC__)  || defined (_MSC_VER)
 #include <time.h>
    #if defined(__BORLANDC__)
    #include <stdio.h>
-   #include <stdlib.h>
    #endif
 #define GET_TIME(a) a=clock()
 #define HOW_LONG(b,a)                             \
diff --git a/Testing/TestReadWriteJPEGReadCompare.cxx b/Testing/TestReadWriteJPEGReadCompare.cxx
index e2e53256..76bce692 100755
--- a/Testing/TestReadWriteJPEGReadCompare.cxx
+++ b/Testing/TestReadWriteJPEGReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteJPEGReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/11/09 10:18:21 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2008/04/10 12:15:34 $
+  Version:   $Revision: 1.15 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,8 @@
 #include "gdcmGlobal.h"
 #include "gdcmTS.h"
 
+#include <stdlib.h>
+
 //Generated file:
 #include "gdcmDataImages.h"
 
diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index 9a9c95bb..f9b2697d 100644
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/13 19:08:34 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2008/04/10 12:15:34 $
+  Version:   $Revision: 1.38 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,8 @@
 #include "gdcmGlobal.h"
 #include "gdcmTS.h"
 
+#include <stdlib.h> // abs
+
 //Generated file:
 #include "gdcmDataImages.h"
 
diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index b5cb2d13..833be232 100644
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/13 15:41:26 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2008/04/10 12:15:35 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,6 +30,8 @@
  #include <stdlib.h> // for atof
  #include <ctype.h>  // for isdigit
 #endif
+#include <string.h> // memcpy
+#include <stdlib.h> // atof
 
 // Could be defined like MAX_SIZE_LOAD_ELEMENT_VALUE
 #define GDCM_MAX_LENGTH_TO_CONVERT_TO_HEXA 8
@@ -427,10 +429,12 @@ void DataEntry::SetString(std::string const &value)
       NewBinArea();
       memcpy(BinArea, value.c_str(), l);
       if (l%2) // padded with blank except for UI
-         if ( vr == "UI" ) 
-            BinArea[l] = '\0';
-         else
-            BinArea[l] = ' ';                
+        {
+        if ( vr == "UI" )
+          BinArea[l] = '\0';
+        else
+          BinArea[l] = ' ';
+        }
    }
    State = STATE_LOADED;
 }
diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index 06a9654d..908ae2d9 100644
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/22 16:14:03 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2008/04/10 12:15:36 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,6 +26,7 @@
 #include <sstream>
 #include <fstream>
 #include <assert.h>
+#include <string.h> // strerror
 #include <errno.h>
 
 namespace GDCM_NAME_SPACE
diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 7c5d24c1..08cb6e62 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/10/25 07:52:59 $
-  Version:   $Revision: 1.46 $
+  Date:      $Date: 2008/04/10 12:15:36 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,8 +23,8 @@
 
 #if defined(__BORLANDC__)
    #include <mem.h> // for memset
-   #include <stdlib.h>
 #endif
+#include <stdlib.h> // abort
 
 extern "C" {
   #include <openjpeg.h>
diff --git a/src/gdcmPixelWriteConvert.cxx b/src/gdcmPixelWriteConvert.cxx
index 8c93216d..4cd1fcdd 100644
--- a/src/gdcmPixelWriteConvert.cxx
+++ b/src/gdcmPixelWriteConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelWriteConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/09/15 11:10:37 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2008/04/10 12:15:36 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 #include "gdcmUtil.h"
 
 #include <vector>
+#include <stdlib.h> // abs
 
 #define WITHOFFSETTABLE 1
 
diff --git a/src/gdcmVRKey.h b/src/gdcmVRKey.h
index c192735b..9ba79403 100644
--- a/src/gdcmVRKey.h
+++ b/src/gdcmVRKey.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVRKey.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/02 10:48:52 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/04/10 12:15:36 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <iomanip> // important
+#include <iostream> // important
 #include <string>
 
 namespace GDCM_NAME_SPACE 
diff --git a/vtk/vtkWriteDicomExtended.cxx b/vtk/vtkWriteDicomExtended.cxx
index 6785d49e..e03c8f15 100755
--- a/vtk/vtkWriteDicomExtended.cxx
+++ b/vtk/vtkWriteDicomExtended.cxx
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 {
    START_USAGE(usage)
    " \n vtkWriteDicomExtended : \n",
-   " Reads a DICOM file and re writes it according to user's requierements.   ",
+   " Reads a DICOM file and re writes it according to user's requirements.    ",
    "                                                                          ",
    " usage: vtkWriteDicomExtended filein=dicom file to read                   ",
    "                           [filecontent = ] [2D]                          ",