--- ParaView-3.4.0/VTK/Filtering/vtkMergePoints.cxx 2007-11-06 18:13:33.000000000 +0100 +++ ParaView3/VTK/Filtering/vtkMergePoints.cxx 2009-05-15 14:13:40.000000000 +0200 @@ -28,21 +28,21 @@ // -1. vtkIdType vtkMergePoints::IsInsertedPoint(const double x[3]) { - int i, ijk0, ijk1, ijk2; + vtkIdType i, ijk0, ijk1, ijk2; vtkIdType idx; vtkIdList *bucket; // // Locate bucket that point is in. // - ijk0 = static_cast( + ijk0 = static_cast( static_cast ((x[0] - this->Bounds[0]) / (this->Bounds[1] - this->Bounds[0])) * (this->Divisions[0] - 1)); - ijk1 = static_cast( + ijk1 = static_cast( static_cast ((x[1] - this->Bounds[2]) / (this->Bounds[3] - this->Bounds[2])) * (this->Divisions[1] - 1)); - ijk2 = static_cast( + ijk2 = static_cast( static_cast ((x[2] - this->Bounds[4]) / (this->Bounds[5] - this->Bounds[4])) * (this->Divisions[2] - 1)); @@ -110,22 +110,22 @@ int vtkMergePoints::InsertUniquePoint(const double x[3], vtkIdType &id) { - int i, ijk0, ijk1, ijk2; + vtkIdType i, ijk0, ijk1, ijk2; vtkIdType idx; vtkIdList *bucket; // // Locate bucket that point is in. // - ijk0 = static_cast( + ijk0 = static_cast( static_cast ((x[0] - this->Bounds[0]) / (this->Bounds[1] - this->Bounds[0])) * (this->Divisions[0] - 1)); - ijk1 = static_cast( + ijk1 = static_cast( static_cast ((x[1] - this->Bounds[2]) / (this->Bounds[3] - this->Bounds[2])) * (this->Divisions[1] - 1)); - ijk2 = static_cast( + ijk2 = static_cast( static_cast ((x[2] - this->Bounds[4]) / (this->Bounds[5] - this->Bounds[4])) * (this->Divisions[2] - 1));