X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarImageData.cpp;h=47f1481e222c24cc722c1e9fff019b53653399f3;hb=a3bf4fd2420496a16c98c8490101f54d25eeb7d3;hp=88476ca82ac0b7225d243b6d16cb32059c472198;hpb=a3c5b7933550c47e3f68d0a40c6cd59aa398f200;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marImageData.cpp b/lib/maracasVisuLib/src/kernel/marImageData.cpp
index 88476ca..47f1481 100644
--- a/lib/maracasVisuLib/src/kernel/marImageData.cpp
+++ b/lib/maracasVisuLib/src/kernel/marImageData.cpp
@@ -16,7 +16,9 @@ marImageData::marImageData(vtkImageData *imagedata)
 	_voiOriginal[3] = 0;
 	_voiOriginal[4] = 0;
 	_voiOriginal[5] = 0;
-	AddImageData(imagedata);
+	if(imagedata!=NULL){
+		AddImageData(imagedata);
+	}
 }
 // ----------------------------------------------------------------------------------------------
 marImageData::~marImageData()
@@ -24,7 +26,7 @@ marImageData::~marImageData()
 	int i,size=_imagedataLST.size();
 	for (i=0;i<size;i++)
 	{
-		_imagedataLST[i]->Delete();
+	//	_imagedataLST[i]->Delete();
 	}
 	_imagedataLST.clear();
 }
@@ -71,19 +73,29 @@ void marImageData::GetVoiOriginal(int voi[6])
 // ----------------------------------------------------------------------------------------------
 vtkImageData *marImageData::GetImageDataT(int t)
 {
-	return _imagedataLST[t];
+	if(_imagedataLST.size() > t){
+		return _imagedataLST[t];
+	}
+	return NULL;
 }
 // ----------------------------------------------------------------------------------------------
 vtkImageData *marImageData::GetImageData()
 {
-	return _imagedataLST[0];
+	if(_imagedataLST.size()>0){
+		return _imagedataLST[0];
+	}
+	return NULL;
 }
 
 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];
 		}