Commit c0440967 authored by David Cole's avatar David Cole
Browse files

COMP: Fix the blasted Visual Studio 6 dashboards.

parent 0e019b09
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define Custom_TreeType vtkModifiedBSPTree #define Custom_TreeType vtkModifiedBSPTree
#endif #endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkCachingInterpolatedVelocityField, "1.1"); vtkCxxRevisionMacro(vtkCachingInterpolatedVelocityField, "1.2");
vtkStandardNewMacro(vtkCachingInterpolatedVelocityField); vtkStandardNewMacro(vtkCachingInterpolatedVelocityField);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const double IVFDataSetInfo::TOLERANCE_SCALE = 1.0E-8; const double IVFDataSetInfo::TOLERANCE_SCALE = 1.0E-8;
...@@ -124,11 +124,12 @@ vtkCachingInterpolatedVelocityField::~vtkCachingInterpolatedVelocityField() ...@@ -124,11 +124,12 @@ vtkCachingInterpolatedVelocityField::~vtkCachingInterpolatedVelocityField()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void vtkCachingInterpolatedVelocityField::SetDataSet(int I, vtkDataSet* dataset, bool staticdataset, vtkAbstractCellLocator *locator) void vtkCachingInterpolatedVelocityField::SetDataSet(int I, vtkDataSet* dataset, bool staticdataset, vtkAbstractCellLocator *locator)
{ {
int N = vtkstd::max(I+1, static_cast<int>(this->CacheList.size())); #define max(x,y) ((x>y) ? (x) : (y))
int N = max(I+1, static_cast<int>(this->CacheList.size()));
this->CacheList.resize(N); this->CacheList.resize(N);
this->CacheList[I].SetDataSet(dataset, this->VectorsSelection, staticdataset, locator); this->CacheList[I].SetDataSet(dataset, this->VectorsSelection, staticdataset, locator);
// //
int maxsize = vtkstd::max(static_cast<int>(this->Weights.size()), dataset->GetMaxCellSize()); int maxsize = max(static_cast<int>(this->Weights.size()), dataset->GetMaxCellSize());
this->Weights.assign(maxsize, 0.0); this->Weights.assign(maxsize, 0.0);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment