ENH: gdcm now compiles on borland

diff --git a/Example/BuildUpDicomDir.cxx b/Example/BuildUpDicomDir.cxx
index 0f84a446bbd7c31eb6d0c7fbf2d756662fdfc464..7429a337b6b9bde004a08e26f09c764f13b41b57 100644 (file)
--- a/Example/BuildUpDicomDir.cxx
+++ b/Example/BuildUpDicomDir.cxx
@@ -20,9 +20,10 @@
 #include <errno.h>
 
 // for Directory pb
-#ifdef _MSC_VER 
+#if defined(_MSC_VER) || defined(__BORLANDC__) 
    #include <windows.h> 
    #include <direct.h>
+   #include <stdio.h>
 #else
    #include <dirent.h>   
    #include <unistd.h>

diff --git a/Example/FindTags.cxx b/Example/FindTags.cxx
index 20a3d52ae9007dfeb699c0c746d176989116f1be..1b3ece26e93fd0aeacac808396d930fa8f22b992 100644 (file)
--- a/Example/FindTags.cxx
+++ b/Example/FindTags.cxx
@@ -1,6 +1,7 @@
 #include <iostream>
 #include "gdcm.h"
 #include "math.h"
+#include <stdio.h>
 
 int main(int argc, char* argv[]) {  
 

diff --git a/Example/TestDcm2Acr.cxx b/Example/TestDcm2Acr.cxx
index 59282f0bebd1095d960242740c111f6570a1e2e9..87d625007599d048741e04425292c57213495ce0 100644 (file)
--- a/Example/TestDcm2Acr.cxx
+++ b/Example/TestDcm2Acr.cxx
@@ -1,5 +1,6 @@
 #include <iostream>
 #include "gdcm.h"
+#include <stdio.h>
 
 int main(int argc, char* argv[])
 {  

diff --git a/Example/makeDicomDir.cxx b/Example/makeDicomDir.cxx
index cc9804f17d3878ff87f7843769dbf49037fa9dff..8d8e3e1fc47d0aa46855dbeaa03be159596a9d23 100644 (file)
--- a/Example/makeDicomDir.cxx
+++ b/Example/makeDicomDir.cxx
@@ -5,31 +5,6 @@
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDirList.h"
 
-#include <fstream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
-#define  ostringstream ostrstream
-
-#include <sys/types.h>
-#include <errno.h>
-
-// for Directory pb
-#ifdef _MSC_VER 
-   #include <windows.h> 
-   #include <direct.h>
-#else
-   #include <dirent.h>   
-   #include <unistd.h>
-#endif
-
-#include <vector>
-#include <algorithm>
-
 // ---
 void StartMethod(void *toto) {
   (void)toto;

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index a61581d756f8feae867a6d9d1b4a2b1da607b85c..a4690f19df2c36bbe72a803f303bf56ed545141d 100644 (file)
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -1,5 +1,6 @@
 #include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include <stdio.h>
 
 //Generated file:
 #include "gdcmDataImages.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5be4a21a49335885ecd607ce8e8aae6b5e983fb1..97dad5ea5acefce2210bcc7b47d6f37cb7bd91c8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,20 +52,16 @@ SET(libgdcm_la_SOURCES
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmjpeg8 
-    gdcmjpeg12
-    gdcmjpeg16
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmjpeg8 
-    gdcmjpeg12
-    gdcmjpeg16
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm Wsock32)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
 
 #The following is not working because when a header file is not found it tries 
 #to find one in the binary dir

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 5d1c9b102c9d0bc87ddee26f6cc8e954301983c3..62a71b7238ca4ad32c78d97557eb7a55a79c102f 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 20:52:13 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2004/11/09 21:55:55 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -57,7 +57,7 @@ typedef  unsigned int   uint32_t;
 #endif //HAVE_NO_STDINT_H
 #endif
 
-#ifdef _MSC_VER 
+#if defined( _MSC_VER) || defined(__BORLANDC__)
 typedef    signed char   int8_t;
 typedef  unsigned char  uint8_t;
 typedef  unsigned short uint16_t;
@@ -65,13 +65,16 @@ typedef  unsigned int   uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #define GDCM_EXPORT __declspec( dllexport )
-#define getcwd _getcwd
 #else
 #define GDCM_EXPORT
 #endif
 
+#ifdef _MSC_VER
+#define getcwd _getcwd
+#endif
+
 // ifdef for old gcc / broken compiler
 #ifdef GDCM_NO_ANSI_STRING_STREAM
 #  include <strstream>

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index b7f4cb00d04bfa18f3376856c1c2f893daaad918..2fef35c1eb68023591088dab324e7d07d5a1431c 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 20:52:13 $
-  Version:   $Revision: 1.77 $
+  Date:      $Date: 2004/11/09 21:55:55 $
+  Version:   $Revision: 1.78 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,7 +34,7 @@
 #include <algorithm>
 #include <sys/types.h>
 
-#ifdef _MSC_VER 
+#if defined( _MSC_VER) || defined(__BORLANDC__)
    #include <direct.h>
 #else
    #include <unistd.h>

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index d4d0c2db649b3e269fce44ef13a4ff99b5ade0d1..0420c80aae4ac0b04a4108fe0c62c08c4f08e0ee 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 23:03:07 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/09 21:55:55 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,9 +22,9 @@
 #include <iostream>
 #include <algorithm>
 
-#if defined(_MSC_VER) || defined (__CYGWIN__)
+#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__)
    #include <windows.h> 
-#ifdef _MSC_VER
+#if defined _MSC_VER || defined(__BORLANDC__)
    #include <direct.h>
 #endif //_MSC_VER
 #else
@@ -91,7 +91,7 @@ int DirList::Explore(std::string const & dirpath, bool recursive)
    int numberOfFiles = 0;
    std::string fileName;
    std::string dirName = Util::NormalizePath(dirpath);
-#if defined(_MSC_VER) || defined(__CYGWIN__)
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__BORLANDC__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index ab150ec1196e13b5ab4c52f2f0e2dae1c8305131..289bf43a91cfda4485f484d61f48c769f40c5848 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/05 21:23:46 $
-  Version:   $Revision: 1.118 $
+  Date:      $Date: 2004/11/09 21:55:55 $
+  Version:   $Revision: 1.119 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
 #include <iomanip>
 
 // For nthos:
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
    #include <winsock.h>
 #else
    #include <netinet/in.h>
@@ -2388,7 +2388,7 @@ bool Document::CheckSwap()
    uint32_t  s32;
    uint16_t  s16;
        
-   char deb[HEADER_LENGTH_TO_READ];
+   char deb[256]; //HEADER_LENGTH_TO_READ];
     
    // First, compare HostByteOrder and NetworkByteOrder in order to
    // determine if we shall need to swap bytes (i.e. the Endian type).

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index ed7402e262d11799a96c2bd2395cd8d89fd283dc..13e90a3e44e66a1e66c174e3dd529190f89fbb98 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/05 20:23:14 $
-  Version:   $Revision: 1.198 $
+  Date:      $Date: 2004/11/09 21:55:55 $
+  Version:   $Revision: 1.199 $
                                                                                 
   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 "gdcmDebug.h"
 #include "gdcmTS.h"
 #include "gdcmValEntry.h"
+#include <stdio.h>
 
 #include <vector>
 

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 3be3868f265f877aba75838a45f1de60fe5cede4..9e2dc35c111685da3c535a93ef32b65d145e8fc9 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg12.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/08 20:05:52 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2004/11/09 21:55:56 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,6 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.h"
+#include <stdio.h>
 
 extern "C" {
 #include "gdcmjpeg/12/jconfig.h"

diff --git a/src/gdcmJpeg16.cxx b/src/gdcmJpeg16.cxx
index a0c96ac615fc94f670d9e880d65dc215bd419167..08575f8cd963a7b7ded9fed297ddf865f247fff8 100644 (file)
--- a/src/gdcmJpeg16.cxx
+++ b/src/gdcmJpeg16.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg16.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/08 20:05:52 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2004/11/09 21:55:56 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,6 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.h"
+#include <stdio.h>
 
 extern "C" {
 #include "gdcmjpeg/16/jconfig.h"

diff --git a/src/gdcmJpeg8.cxx b/src/gdcmJpeg8.cxx
index bd6aec71296e6cd2a4e9c7addf7f3dc555e1a480..e96a6d3808d748574e1ed7480cd460e94c104ea6 100644 (file)
--- a/src/gdcmJpeg8.cxx
+++ b/src/gdcmJpeg8.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg8.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/08 20:05:52 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2004/11/09 21:55:56 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,6 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.h"
+#include <stdio.h>
 
 extern "C" {
 #include "gdcmjpeg/8/jconfig.h"

diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx
index f6f59d0eca89b228be8658cb9c7127556c42bbcf..a4277a761cf1fd1b3f3b870b448d0a1941144aba 100644 (file)
--- a/src/gdcmPixelConvert.cxx
+++ b/src/gdcmPixelConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/08 22:13:40 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/09 21:55:56 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,6 +25,7 @@
 #include "gdcmDebug.h"
 #include "gdcmPixelConvert.h"
 #include <fstream>
+#include <stdio.h>
 
 namespace gdcm
 {