From c2975ffb8c79fa4d745368d8d1c317c5a313dd0a Mon Sep 17 00:00:00 2001 From: regrain Date: Wed, 30 Nov 2005 08:48:15 +0000 Subject: [PATCH] * Fix compilation warnings -- BeNours --- Testing/TestCommand.cxx | 6 +++--- src/gdcmDictEntry.cxx | 6 +++--- src/gdcmDocEntrySet.h | 6 +++--- src/gdcmSerieHelper.cxx | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Testing/TestCommand.cxx b/Testing/TestCommand.cxx index 50d8f71a..f9878660 100644 --- 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 345b99b7..958a4f51 100644 --- 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 319cf3b1..d2a5f485 100644 --- 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 7c8bf536..6928c3aa 100644 --- 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 distmultimap; + std::multimap 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(dist, *it)); + distmultimap.insert(std::pair(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(dist, *it)); + distmultimap.insert(std::pair(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::iterator it2 = distmultimap.begin(); + for (std::multimap::iterator it2 = distmultimap.begin(); it2 != distmultimap.end(); ++it2) { @@ -661,7 +661,7 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) if (DirectOrder) { - for (std::multimap::iterator it3 = distmultimap.begin(); + for (std::multimap::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::const_iterator it4; + std::multimap::const_iterator it4; it4 = distmultimap.end(); do { -- 2.45.1