From 05f4ffeadc3beb5ff48fd88e7342d9287c18a27b Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 9 Nov 2004 21:55:54 +0000 Subject: [PATCH] ENH: gdcm now compiles on borland --- Example/BuildUpDicomDir.cxx | 3 ++- Example/FindTags.cxx | 1 + Example/TestDcm2Acr.cxx | 1 + Example/makeDicomDir.cxx | 25 ------------------------- Testing/TestAllReadCompareDicom.cxx | 1 + src/CMakeLists.txt | 24 ++++++++++-------------- src/gdcmCommon.h | 13 ++++++++----- src/gdcmDicomDir.cxx | 6 +++--- src/gdcmDirList.cxx | 10 +++++----- src/gdcmDocument.cxx | 8 ++++---- src/gdcmHeader.cxx | 5 +++-- src/gdcmJpeg12.cxx | 5 +++-- src/gdcmJpeg16.cxx | 5 +++-- src/gdcmJpeg8.cxx | 5 +++-- src/gdcmPixelConvert.cxx | 5 +++-- 15 files changed, 50 insertions(+), 67 deletions(-) diff --git a/Example/BuildUpDicomDir.cxx b/Example/BuildUpDicomDir.cxx index 0f84a446..7429a337 100644 --- a/Example/BuildUpDicomDir.cxx +++ b/Example/BuildUpDicomDir.cxx @@ -20,9 +20,10 @@ #include // for Directory pb -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__BORLANDC__) #include #include + #include #else #include #include diff --git a/Example/FindTags.cxx b/Example/FindTags.cxx index 20a3d52a..1b3ece26 100644 --- a/Example/FindTags.cxx +++ b/Example/FindTags.cxx @@ -1,6 +1,7 @@ #include #include "gdcm.h" #include "math.h" +#include int main(int argc, char* argv[]) { diff --git a/Example/TestDcm2Acr.cxx b/Example/TestDcm2Acr.cxx index 59282f0b..87d62500 100644 --- a/Example/TestDcm2Acr.cxx +++ b/Example/TestDcm2Acr.cxx @@ -1,5 +1,6 @@ #include #include "gdcm.h" +#include int main(int argc, char* argv[]) { diff --git a/Example/makeDicomDir.cxx b/Example/makeDicomDir.cxx index cc9804f1..8d8e3e1f 100644 --- a/Example/makeDicomDir.cxx +++ b/Example/makeDicomDir.cxx @@ -5,31 +5,6 @@ #include "gdcmDicomDirPatient.h" #include "gdcmDirList.h" -#include -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - -#define ostringstream ostrstream - -#include -#include - -// for Directory pb -#ifdef _MSC_VER - #include - #include -#else - #include - #include -#endif - -#include -#include - // --- void StartMethod(void *toto) { (void)toto; diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx index a61581d7..a4690f19 100644 --- a/Testing/TestAllReadCompareDicom.cxx +++ b/Testing/TestAllReadCompareDicom.cxx @@ -1,5 +1,6 @@ #include "gdcmHeader.h" #include "gdcmFile.h" +#include //Generated file: #include "gdcmDataImages.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5be4a21a..97dad5ea 100644 --- 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 5d1c9b10..62a71b72 100644 --- 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 diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index b7f4cb00..2fef35c1 100644 --- 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 #include -#ifdef _MSC_VER +#if defined( _MSC_VER) || defined(__BORLANDC__) #include #else #include diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index d4d0c2db..0420c80a 100644 --- 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 #include -#if defined(_MSC_VER) || defined (__CYGWIN__) +#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__) #include -#ifdef _MSC_VER +#if defined _MSC_VER || defined(__BORLANDC__) #include #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 ab150ec1..289bf43a 100644 --- 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 // For nthos: -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__BORLANDC__) #include #else #include @@ -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 ed7402e2..13e90a3e 100644 --- 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 #include diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx index 3be3868f..9e2dc35c 100644 --- 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 extern "C" { #include "gdcmjpeg/12/jconfig.h" diff --git a/src/gdcmJpeg16.cxx b/src/gdcmJpeg16.cxx index a0c96ac6..08575f8c 100644 --- 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 extern "C" { #include "gdcmjpeg/16/jconfig.h" diff --git a/src/gdcmJpeg8.cxx b/src/gdcmJpeg8.cxx index bd6aec71..e96a6d38 100644 --- 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 extern "C" { #include "gdcmjpeg/8/jconfig.h" diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx index f6f59d0e..a4277a76 100644 --- 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 +#include namespace gdcm { -- 2.45.1