X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarImageData.cpp;h=3dfa8d47c5428c1b8c748984d14f587a971ddd80;hb=8f1f70ffb361d0ccde7da40ff128cebdcfcf3f13;hp=c717cb9d465df927ce137d496a791f9d67c3cccc;hpb=3948b92b07a8992a6d04081c9649ba63e3e7d613;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/marImageData.cpp b/lib/maracasVisuLib/src/kernel/marImageData.cpp index c717cb9..3dfa8d4 100644 --- a/lib/maracasVisuLib/src/kernel/marImageData.cpp +++ b/lib/maracasVisuLib/src/kernel/marImageData.cpp @@ -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. +# ------------------------------------------------------------------------ */ + /*========================================================================= @@ -26,7 +51,7 @@ marImageData::~marImageData() int i,size=_imagedataLST.size(); for (i=0;iDelete(); + // _imagedataLST[i]->Delete(); } _imagedataLST.clear(); } @@ -91,7 +116,11 @@ void marImageData::removeImageData(int index) { if(index < _imagedataLST.size()){ - //vtkImageData* img = _imagedataLST[index]; + /*vtkImageData* img = _imagedataLST[index]; + if(img->GetReferenceCount()>1){ + img->SetReferenceCount(img->GetReferenceCount()-1); + //img->Delete(); + }*/ for(int i = index; i < _imagedataLST.size()-1; i++){ _imagedataLST[i] = _imagedataLST[i+1]; }