* Fix compilation warnings

   -- BeNours

diff --git a/Testing/TestCommand.cxx b/Testing/TestCommand.cxx
index 50d8f71abafea0e420e952bfde65ef8b80f36f4b..f98786603d86b14575a4bb6a01d07b5671c4870a 100644 (file)
--- a/Testing/TestCommand.cxx
+++ b/Testing/TestCommand.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCommand.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 17:28:58 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/11/30 08:48:15 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -56,7 +56,7 @@ void CallbackTest(gdcm::CallbackCommand *cmd)
    fctExecuted = true;
 }
 
-int TestCommand(int argc, char *argv[]) 
+int TestCommand(int , char *[]) 
 {
    int error=0;
 

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 345b99b7b4abf812f937f53cbf28c32fa4ce75bb..958a4f51415a933cb722ebcf0216205f91e9b8a7 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 17:21:34 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2005/11/30 08:48:17 $
+  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
@@ -101,7 +101,7 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
  * @param   os ostream we want to print in
  * @param indent Indentation string to be prepended during printing
  */
-void DictEntry::Print(std::ostream &os, std::string const &indent )
+void DictEntry::Print(std::ostream &os, std::string const & )
 {
    os << GetKey(); 
    os << " [" << VR  << "] ";

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 319cf3b118b2b02fd69d3ab8fee556156c47713c..d2a5f485c4fcf5b33438b8e8744d05904abef74d 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 12:48:47 $
-  Version:   $Revision: 1.66 $
+  Date:      $Date: 2005/11/30 08:48:17 $
+  Version:   $Revision: 1.67 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -111,7 +111,7 @@ public:
                          VRKey const &vr = GDCM_VRUNKNOWN);
    SeqEntry *NewSeqEntry(uint16_t group, uint16_t elem);
 
-   virtual void Copy(DocEntrySet *set) {};
+   virtual void Copy(DocEntrySet *) {};
 
 protected:
    /// Canonical Constructor

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 7c8bf536fc8599ed2ef3f4a3d8c492931323a73f..6928c3aa434bc1ac3cb86d77c6d1ab6707bba64d 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 17:23:37 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2005/11/30 08:48:17 $
+  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
@@ -575,7 +575,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
    double min = 0, max = 0;
    bool first = true;
 
-   std::multimap<float,File *> distmultimap;
+   std::multimap<double,File *> distmultimap;
    // Use a multimap to sort the distances from 0,0,0
    for ( FileList::const_iterator 
          it = fileList->begin();
@@ -603,7 +603,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
             dist += normal[i]*ipp[i];
          }
     
-         distmultimap.insert(std::pair<const float,File *>(dist, *it));
+         distmultimap.insert(std::pair<const double,File *>(dist, *it));
 
          max = min = dist;
          first = false;
@@ -620,7 +620,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
             dist += normal[i]*ipp[i];
          }
 
-         distmultimap.insert(std::pair<const float,File *>(dist, *it));
+         distmultimap.insert(std::pair<const double,File *>(dist, *it));
 
          min = (min < dist) ? min : dist;
          max = (max > dist) ? max : dist;
@@ -638,7 +638,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
 
    // Check to see if image shares a common position
     bool ok = true;
-    for (std::multimap<float, File *>::iterator it2 = distmultimap.begin();
+    for (std::multimap<double, File *>::iterator it2 = distmultimap.begin();
                                                  it2 != distmultimap.end();
                                                  ++it2)
     {
@@ -661,7 +661,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
 
    if (DirectOrder)
    {  
-      for (std::multimap<float, File *>::iterator it3 = distmultimap.begin();
+      for (std::multimap<double, File *>::iterator it3 = distmultimap.begin();
                                                    it3 != distmultimap.end();
                                                  ++it3)
       {
@@ -670,7 +670,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList )
    }
    else // user asked for reverse order
    {
-      std::multimap<float, File *>::const_iterator it4;
+      std::multimap<double, File *>::const_iterator it4;
       it4 = distmultimap.end();
       do
       {