From: malaterre <malaterre>
Date: Fri, 3 Dec 2004 20:43:36 +0000 (+0000)
Subject: COMP: Borland could not compile gdcm... BTW there is something fishy with the protect... 
X-Git-Tag: Version1.0.bp~540
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=faf9f777a09c115e44b29d40a0c6ea2d122fc1e7;p=gdcm.git

COMP: Borland could not compile gdcm... BTW there is something fishy with the protected on Borland
---

diff --git a/Example/FindTags.cxx b/Example/FindTags.cxx
index 6620c327..a091d156 100644
--- a/Example/FindTags.cxx
+++ b/Example/FindTags.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: FindTags.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:55 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2004/12/03 20:43:36 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,7 @@
 #include "gdcmUtil.h"
 
 #include <iostream>
+#include <stdio.h> // for sscanf
 
 int main(int argc, char* argv[])
 {
diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index 48e2f00b..d31b1f40 100644
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:56 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/12/03 20:43:36 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,7 +17,9 @@
 =========================================================================*/
 #include "gdcmHeader.h"
 #include "gdcmFile.h"
+
 #include <iostream>
+#include <fstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -43,7 +45,8 @@ int InternalTest(std::string const & filename,
       ////// Check for existence of reference baseline dicom file:
       std::cout << "2...";
 
-      FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      //FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
+      std::ifstream testFILE( referenceFileName.c_str() );
       if (! testFILE )
       {
          uint8_t* testedImageData = tested->GetImageData(); // Kludge
@@ -54,8 +57,9 @@ int InternalTest(std::string const & filename,
       }
       else
       {
-         fclose( testFILE );
+         //fclose( testFILE );
       }
+      testFILE.close();
 
       ////// Step 3a:
       ////// When reference file is not gdcm readable test is failed:
diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 5431412c..b1465abb 100644
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/30 16:24:31 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/12/03 20:43:37 $
+  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
@@ -56,6 +56,7 @@ typedef std::string BaseTagKey;
  */
 class GDCM_EXPORT DocEntrySet
 {
+friend class File;
 public:
    DocEntrySet() {};
    virtual ~DocEntrySet() {};
diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 36e790fa..5c9dd5d6 100644
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2004/12/03 20:43:37 $
+  Version:   $Revision: 1.3 $
                                                                                 
   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,7 @@
 #include "gdcmJPEGFragmentsInfo.h"
 
 #include <fstream>
+#include <stdio.h> //for sscanf
 
 namespace gdcm
 {
diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 44b894d4..d952caf3 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 16:49:01 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2004/12/03 20:43:37 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,13 +27,15 @@
 #include <stdarg.h>  //only included in implementation file
 #include <stdio.h>   //only included in implementation file
 
-#if defined _MSC_VER || defined(__BORLANDC__)
+#if defined _MSC_VER
    #include <winsock.h>  // for gethostname & gethostbyname
    #undef GetCurrentTime
 #else
+#ifndef __BORLANDC__
    #include <unistd.h>  // for gethostname
    #include <netdb.h>   // for gethostbyname
 #endif
+#endif
 
 namespace gdcm 
 {