Merge topic 'FlyingEdges-Overrun'

ccc82fcb Eliminate last advance operation on each voxel row
e181456d

 Fixed overrrun issue former MR 1120
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Reviewed-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Sean McBride <sean@rogue-research.com>
Merge-request: !1634

Filters/Core/vtkFlyingEdges3D.cxx

@@ -1057,6 +1057,7 @@ GenerateOutput(double value, T* rowPtr, vtkIdType row, vtkIdType slice)
   const T* sPtr = rowPtr + xL*incs[0];
   const double xSpace = this->Spacing[0];
   const vtkIdType dim0Wall = this->Dims[0]-2;
+  const vtkIdType endVoxel = xR-1;
 
   for (i=xL; i < xR; ++i)
     {
@@ -1080,13 +1081,16 @@ GenerateOutput(double value, T* rowPtr, vtkIdType row, vtkIdType slice)
       this->AdvanceVoxelIds(eCase,eIds);
       }
 
-    // advance along voxel row
+    // Advance along voxel row if not at the end. Saves a little work.
+    if ( i < endVoxel )
+      {
       ePtr[0]++; ePtr[1]++; ePtr[2]++; ePtr[3]++;
       eCase = this->GetEdgeCase(ePtr);
 
       ++ijk[0];
       sPtr += incs[0];
       x[0] += xSpace;
+      }//if not at end of voxel row
     } //for all non-trimmed cells along this x-edge
 }