+/*# ---------------------------------------------------------------------
+#
+# 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
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;
{
//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]])
{
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]])
{
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]])
{
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]);
}