X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=6928c3aa434bc1ac3cb86d77c6d1ab6707bba64d;hb=c2975ffb8c79fa4d745368d8d1c317c5a313dd0a;hp=7c8bf536fc8599ed2ef3f4a3d8c492931323a73f;hpb=33b1eec26f02131242fbfdef52184b24763cf4e6;p=gdcm.git 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 {