X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkApplyMask.cxx;h=8854ab2170e4d7574f3b33384f5f0cd245c879ba;hb=refs%2Fheads%2Fvtk9itk5wx3-macos;hp=8d346915a5c27c3a62e2b757ed69c2a52194e986;hpb=95ad6b166169711fa0fe3c1fd984d86430a6c603;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkApplyMask.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkApplyMask.cxx
index 8d34691..8854ab2 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkApplyMask.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkApplyMask.cxx
@@ -38,7 +38,7 @@ void ApplyMask::Process()
 		int 				extMask[6];
 		vtkImageData 		*resultImage=NULL;
 		bbGetInputImage()->GetExtent( extImage );
-		bbGetInputImage()->GetExtent( extMask );
+        bbGetInputMask()->GetExtent( extMask );
 		int dimXImage 		= extImage[1]-extImage[0]+1;
 		int dimYImage		= extImage[3]-extImage[2]+1;
 		int dimZImage 		= extImage[5]-extImage[4]+1;
@@ -93,10 +93,10 @@ long int k4omp=(double)(size-1)*0.6;
 long int k5omp=(double)(size-1)*0.8;
 long int k6omp=(double)(size-1)*1.0;
 printf("EED ApplyMask::Process (with openmp)\n");
-				#pragma omp parallel for 
-				for (i=0; i<size;i++)
+				#pragma omp parallel for
+				for (i=0; i<size; i++)
 				{
-if ( (k1omp==i) || (k2omp==i) || (k3omp==i) || 
+if ( (k1omp==i) || (k2omp==i) || (k3omp==i) ||
      (k4omp==i) || (k5omp==i) || (k6omp==i) ) { printf("  %d%\n", (int)(((double)i/(double)(size-1))*100 )); }
 					double vItmpOMP;
 					double vMtmpOMP;
@@ -133,7 +133,12 @@ if ( (k1omp==i) || (k2omp==i) || (k3omp==i) ||
 		} //if dim
 		resultImage->Modified();
 		bbSetOutputOut( resultImage );
-	} // if Image && Mask	
+    } else {
+        if (bbGetInputType()==2)
+        {
+            bbSetOutputOut( bbGetInputImage() );
+        }
+    }// if Image && Mask
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)