From 49f2072fc0ceb8934abd40a2febd1ef650535370 Mon Sep 17 00:00:00 2001 From: jpr Date: Fri, 22 Jun 2007 11:01:57 +0000 Subject: [PATCH] Avoid some warnings --- Example/ToInTag.cxx | 8 ++++---- Example/exSerieHelper.cxx | 14 +++++++------- Testing/TestPrintAllDocument.cxx | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Example/ToInTag.cxx b/Example/ToInTag.cxx index ccf6bcbe..119779d1 100755 --- a/Example/ToInTag.cxx +++ b/Example/ToInTag.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: ToInTag.cxx,v $ Language: C++ - Date: $Date: 2007/06/04 08:51:23 $ - Version: $Revision: 1.13 $ + Date: $Date: 2007/06/22 11:01:57 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -615,9 +615,9 @@ int main(int argc, char *argv[]) if ( GDCM_NAME_SPACE::Util::DicomStringEqual(modelName,"TrioTim") ) { - if (seriesDescription.find("90", 0) != -1) + if (seriesDescription.find("90", 0) != std::string::npos) chSessionIndex = "1"; // 90 deg -> COL - else if (seriesDescription.find("0", 0)!= -1) + else if (seriesDescription.find("0", 0)!= std::string::npos) chSessionIndex = "2"; // 0 deg -> ROW else { diff --git a/Example/exSerieHelper.cxx b/Example/exSerieHelper.cxx index a2fb12ef..9922486e 100644 --- a/Example/exSerieHelper.cxx +++ b/Example/exSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2007/06/21 15:01:00 $ - Version: $Revision: 1.12 $ + Date: $Date: 2007/06/22 11:01:57 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -94,13 +94,13 @@ int main(int argc, char *argv[]) std::cout << "GetZSpacing() of sorted SingleSerieUIDFileSet " << "from GDCM_NAME_SPACE::SerieHelper: " << zspacing << std::endl; std::cout << " ('-1' means all the files have the same position)" << std::endl; - for (std::vector::iterator it = l->begin(); - it != l->end(); - ++it) + for (std::vector::iterator it2 = l->begin(); + it2 != l->end(); + ++it2) { // Just to show : GetZSpacing from a GDCM_NAME_SPACE::File may be different - std::cout << (*it)->GetFileName() << " --> GetZSpacing() from GDCM_NAME_SPACE::File : " - << (*it)->GetZSpacing() << std::endl; + std::cout << (*it2)->GetFileName() << " --> GetZSpacing() from GDCM_NAME_SPACE::File : " + << (*it2)->GetZSpacing() << std::endl; } break; // we only deal with the first one ... Why not ? diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx index 4fc44dc0..5b8db1d6 100644 --- a/Testing/TestPrintAllDocument.cxx +++ b/Testing/TestPrintAllDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestPrintAllDocument.cxx,v $ Language: C++ - Date: $Date: 2007/06/21 16:31:02 $ - Version: $Revision: 1.16 $ + Date: $Date: 2007/06/22 11:01:58 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,7 @@ int TestPrintAllDocument(int argc, char *argv[]) int swapC; unsigned int j; std::string pixelType, photomInterp; - int l; + unsigned int l; l = strlen("PALETTE COLOR "); //gdcm::Debug::DebugOn(); -- 2.45.1