Merge topic 'clamp-interpolated-scalars' into master

8c73f97f Clamp integer scalars in InterpolateTuple().

Common/Core/vtkDataArray.cxx

@@ -29,11 +29,14 @@
 #include "vtkMath.h"
 #include "vtkShortArray.h"
 #include "vtkSignedCharArray.h"
+#include "vtkTypeTraits.h"
 #include "vtkUnsignedCharArray.h"
 #include "vtkUnsignedIntArray.h"
 #include "vtkUnsignedLongArray.h"
 #include "vtkUnsignedShortArray.h"
 
+#include <algorithm> // for min(), max()
+
 vtkInformationKeyRestrictedMacro(vtkDataArray, COMPONENT_RANGE, DoubleVector, 2);
 vtkInformationKeyRestrictedMacro(vtkDataArray, L2_NORM_RANGE, DoubleVector, 2);
 
@@ -251,6 +254,8 @@ void vtkDataArray::GetData(vtkIdType tupleMin, vtkIdType tupleMax, int compMin,
 template <class T>
 inline void vtkDataArrayRoundIfNecessary(double val, T* retVal)
 {
+  val = std::max(val, static_cast<double>(vtkTypeTraits<T>::Min()));
+  val = std::min(val, static_cast<double>(vtkTypeTraits<T>::Max()));
   *retVal = static_cast<T>((val>=0.0)?(val + 0.5):(val - 0.5));
 }
 

Filters/Modeling/Testing/Cxx/CMakeLists.txt

 create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+  TestButterflyScalars.cxx
   TestNamedColorsIntegration.cxx
   TestPolyDataPointSampler.cxx
   TestQuadRotationalExtrusion.cxx

Filters/Modeling/Testing/Cxx/TestButterflyScalars.cxx

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    TestButterflyScalars.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+// Test that no scalar overflow occurs with ButterflySubdivision
+
+#include "vtkSmartPointer.h"
+
+#include "vtkCylinderSource.h"
+#include "vtkPolyData.h"
+#include "vtkPointData.h"
+#include "vtkUnsignedCharArray.h"
+#include "vtkFloatArray.h"
+#include "vtkIntArray.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkButterflySubdivisionFilter.h"
+#include "vtkLoopSubdivisionFilter.h"
+#include "vtkTriangleFilter.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderer.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkRegressionTestImage.h"
+
+//----------------------------------------------------------------------------
+int TestButterflyScalars(int argc, char * argv[])
+{
+  //Defining a cylinder source.
+  vtkSmartPointer<vtkCylinderSource> cylinderSource =
+    vtkSmartPointer<vtkCylinderSource>::New();
+  cylinderSource->Update();
+
+  vtkSmartPointer<vtkTriangleFilter> triangles =
+    vtkSmartPointer<vtkTriangleFilter>::New();
+  triangles->SetInputConnection(cylinderSource->GetOutputPort());
+  triangles->Update();
+
+  vtkSmartPointer<vtkPolyData> originalMesh;
+  originalMesh = triangles->GetOutput();
+
+  vtkSmartPointer<vtkUnsignedCharArray> colors =
+    vtkSmartPointer<vtkUnsignedCharArray>::New();
+  colors->SetNumberOfComponents(3);
+  colors->SetNumberOfTuples(originalMesh->GetNumberOfPoints());
+  colors->SetName("Colors");
+
+  //Creating an array to store the values according to which the
+  //colors are selected.
+  //Values are inserted for each of the points in the polydata
+  int *colorAT = new int[originalMesh->GetNumberOfPoints()];
+  for (int i = 0; i < originalMesh->GetNumberOfPoints(); i++)
+    {
+    colorAT[i] = i;
+    }
+
+  int activationTime;
+  //Loop to select colors for each of the points in the polydata.
+  for (int i = 0; i < originalMesh->GetNumberOfPoints(); i++)
+    {
+    activationTime = colorAT[i];
+    if (activationTime > 0 && activationTime < 5)
+      {
+      //Black
+      colors->InsertTuple3(i, 255, 255, 0);
+      }
+    else if (activationTime > 4 && activationTime < 10)
+      {
+      //Blue
+      colors->InsertTuple3(i, 0, 0, 255);
+      }
+    else if (activationTime > 9 && activationTime < 300)
+      {
+      //Red
+      colors->InsertTuple3(i, 255, 0, 0);
+      }
+    else
+      {
+      colors->InsertTuple3(i, 255, 0, 0);
+      }
+    }
+
+  originalMesh->GetPointData()->SetScalars(colors);
+
+  //Subdivision.
+  int numberOfSubdivisions = 4;
+  vtkSmartPointer<vtkButterflySubdivisionFilter> subdivisionFilter =
+    vtkSmartPointer<vtkButterflySubdivisionFilter>::New();
+
+  subdivisionFilter->SetNumberOfSubdivisions(numberOfSubdivisions);
+  subdivisionFilter->SetInputData(originalMesh);
+  subdivisionFilter->Update();
+
+  vtkSmartPointer<vtkRenderWindow> renderWindow =
+    vtkSmartPointer<vtkRenderWindow>::New();
+  vtkSmartPointer<vtkRenderer> renderer =
+    vtkSmartPointer<vtkRenderer>::New();
+  vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor =
+    vtkSmartPointer<vtkRenderWindowInteractor>::New();
+  renderWindowInteractor->SetRenderWindow(renderWindow);
+
+  //Create a mapper and actor
+  vtkSmartPointer<vtkPolyDataMapper> mapper =
+    vtkSmartPointer<vtkPolyDataMapper>::New();
+  mapper->SetInputConnection(subdivisionFilter->GetOutputPort());
+  vtkSmartPointer<vtkActor> actor =
+    vtkSmartPointer<vtkActor>::New();
+  actor->SetMapper(mapper);
+
+  renderer->AddActor(actor);
+  renderer->SetBackground(0, 0, 0);
+  renderer->ResetCamera();
+  renderWindow->AddRenderer(renderer);
+  renderWindow->Render();
+
+  int testStatus = vtkRegressionTestImage(renderWindow.GetPointer());
+  if (testStatus == vtkRegressionTester::DO_INTERACTOR)
+    {
+    renderWindowInteractor->Start();
+    }
+
+  return (testStatus ? EXIT_SUCCESS : EXIT_FAILURE);
+}