From: malaterre <malaterre>
Date: Tue, 9 Nov 2004 22:15:36 +0000 (+0000)
Subject: ENH: Some more borland issues
X-Git-Tag: Version1.0.bp~616
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1db4734a7dfefbf5b9e8e3e7b102b36ab68d8243;p=gdcm.git

ENH: Some more borland issues
---

diff --git a/Example/Write.cxx b/Example/Write.cxx
index c1be9946..51352fe6 100644
--- a/Example/Write.cxx
+++ b/Example/Write.cxx
@@ -92,6 +92,7 @@ int main(int argc, char* argv[])
                 << std::endl; 
    }
    imageData= f1->GetImageData();
+   (void)imageData;  // to avoid warnings
 
    switch (argv[2][0]) {
    case 'a' :
diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 787c529c..fe3a5414 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/15 10:43:27 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2004/11/09 22:15:36 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -116,7 +116,7 @@ void Debug::Exit(int a)
 #ifdef __GNUC__
    std::exit(a);
 #endif
-#ifdef _MSC_VER
+#ifdef _MSC_VER || __BORLANDC__
    exit(a);    // Found in #include <stdlib.h>
 #endif
 }
diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 2fef35c1..f61ae1b5 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/09 21:55:55 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2004/11/09 22:15:36 $
+  Version:   $Revision: 1.79 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -775,7 +775,7 @@ void DicomDir::CreateDicomDir()
       return;
    }
 
-   DicomDirType type = DicomDir::GDCM_DICOMDIR_META;
+   DicomDirType type; // = DicomDir::GDCM_DICOMDIR_META;
    MetaElems = NewMeta();
 
    ListSQItem listItems = s->GetSQItems();
diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 0777f253..46b77b93 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 20:52:13 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2004/11/09 22:15:36 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -57,15 +57,12 @@ void DocEntry::Print(std::ostream& os)
    PrintLevel = 2; // FIXME
    
    size_t o;
-   unsigned short int g, e;
    std::string st;
    TSKey v;
    std::string d2, vr;
    std::ostringstream s;
    uint32_t lgth;
 
-   g  = GetGroup();
-   e  = GetElement();
    o  = GetOffset();
    vr = GetVR();
 
diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 340dc812..c57ac307 100644
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmHeaderHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:46 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2004/11/09 22:15:36 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -247,12 +247,12 @@ bool SerieHeader::ImagePositionPatientOrdering()
 
 bool SerieHeader::ImageNumberOrdering() 
 {
-   int min, max, pos;
+   int min, pos;
    int n = 0;//CoherentGdcmFileList.size() is a O(N) operation !!
    unsigned char *partition;
   
    GdcmHeaderList::const_iterator it = CoherentGdcmFileList.begin();
-   min = max = (*it)->GetImageNumber();
+   min = (*it)->GetImageNumber();
 
    for (; it != CoherentGdcmFileList.end(); ++it, ++n)
    {