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

Correct 'may be used uninitialized in this function' warnings in wavelets

Browse Source
This commit is contained in:
Robert Maynard 2018-04-24 11:42:06 -04:00
parent ebf96077fd
commit 4b9a8143c8
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vtkm/rendering/Texture2D.h
View File

@ -191,15 +191,17 @@ public:
VTKM_EXEC
inline void GetNextCoords(vtkm::Id x, vtkm::Id y, vtkm::Id& xn, vtkm::Id& yn) const
{
if (WrapMode == TextureWrapMode::Clamp)
switch (WrapMode)
{
xn = (x + 1) < Width ? (x + 1) : x;
yn = (y + 1) < Height ? (y + 1) : y;
}
else if (WrapMode == TextureWrapMode::Repeat)
{
xn = (x + 1) % Width;
yn = (y + 1) % Height;
case TextureWrapMode::Clamp:
xn = (x + 1) < Width ? (x + 1) : x;
yn = (y + 1) < Height ? (y + 1) : y;
break;
case TextureWrapMode::Repeat:
default:
xn = (x + 1) % Width;
yn = (y + 1) % Height;
break;
}
}

10
vtkm/worklet/wavelets/WaveletDWT.h
View File

@ -841,7 +841,7 @@ public:
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimX = inPretendDimX;
vtkm::Id extDimY = inPretendDimY;
vtkm::Id ext1DimZ, ext2DimZ, ext3DimZ, ext4DimZ;
vtkm::Id ext1DimZ = 0, ext2DimZ = 0, ext3DimZ = 0, ext4DimZ = 0;
this->IDWTHelper3DFrontBack(coeffIn,
inDimX,
inDimY,
@ -910,7 +910,7 @@ public:
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimX = inPretendDimX;
vtkm::Id extDimZ = inPretendDimZ;
vtkm::Id ext1DimY, ext2DimY, ext3DimY, ext4DimY;
vtkm::Id ext1DimY = 0, ext2DimY = 0, ext3DimY = 0, ext4DimY = 0;
this->IDWTHelper3DTopDown(afterZ,
inPretendDimX,
inPretendDimY,
@ -973,7 +973,7 @@ public:
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimY = inPretendDimY;
vtkm::Id extDimZ = inPretendDimZ;
vtkm::Id ext1DimX, ext2DimX, ext3DimX, ext4DimX;
vtkm::Id ext1DimX = 0, ext2DimX = 0, ext3DimX = 0, ext4DimX = 0;
this->IDWTHelper3DLeftRight(afterY,
inPretendDimX,
inPretendDimY,
@ -1893,7 +1893,7 @@ public:
{
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimX = inPretendDimX;
vtkm::Id ext1DimY, ext2DimY, ext3DimY, ext4DimY;
vtkm::Id ext1DimY = 0, ext2DimY = 0, ext3DimY = 0, ext4DimY = 0;
this->IDWTHelper2DTopDown(coeffIn,
inDimX,
inDimY,
@ -1946,7 +1946,7 @@ public:
{
BasicArrayType ext1, ext2, ext3, ext4;
vtkm::Id extDimY = inPretendDimY;
vtkm::Id ext1DimX, ext2DimX, ext3DimX, ext4DimX;
vtkm::Id ext1DimX = 0, ext2DimX = 0, ext3DimX = 0, ext4DimX = 0;
this->IDWTHelper2DLeftRight(afterY,
inPretendDimX,
inPretendDimY,

4
vtkm/worklet/wavelets/WaveletTransforms.h
View File

@ -2487,7 +2487,7 @@ public:
{
vtkm::Id workX, workY, output1D;
Output1Dto2D(workIndex, workX, workY);
vtkm::Id inputMatrix, inputIdx;
vtkm::Id inputMatrix = 0, inputIdx = 0;
using OutputValueType = typename OutputPortalType::ValueType;
if (modeLR)
@ -2718,7 +2718,7 @@ public:
const vtkm::Id& workIdx) const
{
vtkm::Id workX, workY;
vtkm::Id k1, k2, xi, yi, inputMatrix, inputIdx;
vtkm::Id k1 = 0, k2 = 0, xi = 0, yi = 0, inputMatrix = 0, inputIdx = 0;
Output1Dto2D(workIdx, workX, workY);
// left-right, odd filter