Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing Min and Max calls not defined for non-floating point types

Browse Source
This commit is contained in:
Matt Larsen 2017-03-13 21:12:02 -07:00
parent cfc252ad83
commit 1d4cfc2a28
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtkm/rendering/raytracing/VolumeRendererStructured.h
View File

@ -429,7 +429,9 @@ public:
vtkm::Id colorIndex = static_cast<vtkm::Id>(
finalScalar * static_cast<vtkm::Float32>(ColorMapSize));
colorIndex = vtkm::Min(ColorMapSize, vtkm::Max(0,colorIndex));
if(colorIndex < 0) colorIndex = 0;
if(colorIndex > ColorMapSize) colorIndex = ColorMapSize;
vtkm::Vec<vtkm::Float32,4> sampleColor = ColorMap.Get(colorIndex);
//composite
@ -543,7 +545,8 @@ public:
vtkm::Float32 normalizedScalar = (scalar0 - MinScalar) * InverseDeltaScalar;
vtkm::Id colorIndex = static_cast<vtkm::Id>(
normalizedScalar * static_cast<vtkm::Float32>(ColorMapSize));
colorIndex = vtkm::Min(ColorMapSize, vtkm::Max(0,colorIndex));
if(colorIndex < 0) colorIndex = 0;
if(colorIndex > ColorMapSize) colorIndex = ColorMapSize;
sampleColor = ColorMap.Get(colorIndex);
Locator.GetMinPoint(cell, bottomLeft);
tx = (sampleLocation[0] - bottomLeft[0]) * invSpacing[0];