Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct casting warnings found inside vtkm_rendering

Browse Source
This commit is contained in:
Robert Maynard 2018-04-24 11:41:42 -04:00 committed by Li-Ta Lo
parent 38654e7ae9
commit fb23916dda
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/rendering/Canvas.cxx
View File

@ -213,8 +213,9 @@ struct DrawColorBar : public vtkm::worklet::WorkletMapField
const vtkm::Vec<vtkm::UInt8, 4> color = colorMap.Get(sample);
vtkm::Float32 normalizedHeight =
Horizontal ? vtkm::Float32(y) / BarHeight : vtkm::Float32(x) / BarWidth;
vtkm::Float32 normalizedHeight = Horizontal
? static_cast<vtkm::Float32>(y) / static_cast<vtkm::Float32>(BarHeight)
: static_cast<vtkm::Float32>(x) / static_cast<vtkm::Float32>(BarWidth);
// offset to global image coord
x += BarBottomLeft[0];
y += BarBottomLeft[1];

8
vtkm/rendering/Texture2D.h
View File

@ -151,16 +151,16 @@ public:
VTKM_EXEC
inline ColorType GetNearestNeighbourFilteredColor(vtkm::Float32 u, vtkm::Float32 v) const
{
vtkm::Id x = static_cast<vtkm::Id>(vtkm::Round(u * (Width - 1)));
vtkm::Id y = static_cast<vtkm::Id>(vtkm::Round(v * (Height - 1)));
vtkm::Id x = static_cast<vtkm::Id>(vtkm::Round(u * static_cast<vtkm::Float32>(Width - 1)));
vtkm::Id y = static_cast<vtkm::Id>(vtkm::Round(v * static_cast<vtkm::Float32>(Height - 1)));
return GetColorAtCoords(x, y);
}
VTKM_EXEC
inline ColorType GetLinearFilteredColor(vtkm::Float32 u, vtkm::Float32 v) const
{
u = u * Width - 0.5f;
v = v * Height - 0.5f;
u = u * static_cast<vtkm::Float32>(Width) - 0.5f;
v = v * static_cast<vtkm::Float32>(Height) - 0.5f;
vtkm::Id x = static_cast<vtkm::Id>(vtkm::Floor(u));
vtkm::Id y = static_cast<vtkm::Id>(vtkm::Floor(v));
vtkm::Float32 uRatio = u - static_cast<vtkm::Float32>(x);