#3248 BBTK Feature New Normal - box bbstdExecSystemCommand Verbose option

[bbtk.git] / packages / vtk / src / bbvtkImageBoundaries.cxx

diff --git a/packages/vtk/src/bbvtkImageBoundaries.cxx b/packages/vtk/src/bbvtkImageBoundaries.cxx
index fb9eb2464504f5fd473f5a21534fea7956cd50d1..3275137da798188ab483ae753146d7049f218751 100644 (file)
--- a/packages/vtk/src/bbvtkImageBoundaries.cxx
+++ b/packages/vtk/src/bbvtkImageBoundaries.cxx
@@ -32,7 +32,15 @@
 #include "bbvtkPackage.h"
 #include "creaVtk_MACROS.h"
 
+
+/*
+
 #include <omp.h>
+
+*/
+
+
+
 namespace bbvtk
 {
 
@@ -43,10 +51,19 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageBoundaries,bbtk::AtomicBlackBox);
 //===== 
 void ImageBoundaries::Process()
 {
-       if (bbGetInputIn()!=NULL)
-       {
-               int ext[6];             
+       if (bbGetInputIn()!=NULL){
+               int i,j,k;      
+               int ext[6];
+               double value;
+               
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
                bbGetInputIn()->GetWholeExtent(ext);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+               bbGetInputIn()->GetExtent(ext);
+#endif
+
                int maxX        = ext[1]-ext[0]+1;
                int maxY        = ext[3]-ext[2]+1;
                int maxZ        = ext[5]-ext[4]+1;
@@ -83,10 +100,8 @@ void ImageBoundaries::Process()
 */
 
                DEF_POINTER_IMAGE_VTK_CREA(vI,ssI,pI,stI,bbGetInputIn())        
-               int i;
-               int j;  
                long int index=0;
-               for (int k=0 ; k<maxZ ; k++)
+               for ( k=0 ; k<maxZ ; k++)
                {
                        for (j=0 ; j<maxY ; j++)
                        {