X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourPropagation.cxx;h=5364820158d837d6512e2836188e6c26db74750b;hb=4ebf92429cae4c60761aa8798a5135c7512d83bc;hp=0b30ca16487dc0acf39ec70ed1457f375aac024f;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
index 0b30ca1..5364820 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "ContourPropagation.h"
 
 //Construction
@@ -33,7 +58,7 @@ bool ContourPropagation::ifSliceKeyContourExist(int slice)
 	int i,size=_sliceKeyContourVec.size();
 	for (i=0; ((i<size) && (result==false)); i++)
 	{
-		int temp=_sliceKeyContourVec[i];
+		//int temp=_sliceKeyContourVec[i]; // JPRx
 		if (_sliceKeyContourVec[i]==slice)
 		{
 			result=true;
@@ -119,7 +144,7 @@ bool ContourPropagation::mustOrderAppend()
 	{
 		//ASCENDING
 		j=0;
-		for(i=0; i<_InS.size()-1; i++)
+		for(i=0; i<(int)(_InS.size())-1; i++)
 		{
 			if(_InZ[j]>_InZ[j+_InS[i]])
 			{
@@ -131,7 +156,7 @@ bool ContourPropagation::mustOrderAppend()
 		if(orderA == false)
 		{
 			j=0;
-			for(i=0; i<_InS.size()-1; i++)
+			for(i=0; i<(int)(_InS.size())-1; i++)
 			{
 				if(_InZ[j]<_InZ[j+_InS[i]])
 				{
@@ -175,7 +200,7 @@ void ContourPropagation::orderAppend()
 		tempZ.clear();
 		tempS.clear();
 		cont = 0;
-		for(i=0; i<_InS.size()-1; i++)
+		for(i=0; i<(int)(_InS.size())-1; i++)
 		{
 			if(_InZ[cont]<_InZ[cont+_InS[i]])
 			{
@@ -221,7 +246,7 @@ void ContourPropagation::orderAppend()
 		vf->copyVector(&tempY,&_InY);
 		vf->copyVector(&tempZ,&_InZ);
 		delete vf;
-		for(i=0; i<tempS.size(); i++)
+		for(i=0; i<(int)(tempS.size()); i++)
 		{
 			_InS.push_back(tempS[i]);
 		}