Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Christian Butz
VTK
Commits
97fc131d
Commit
97fc131d
authored
Aug 14, 2012
by
Dave DeMarle
Browse files
silence more comp warnings
Change-Id: Id748d1770f6695f6564070c6466aeaf9804ed3a0
parent
a824648f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Common/DataModel/vtkPath.cxx
View file @
97fc131d
...
...
@@ -14,6 +14,7 @@
=========================================================================*/
#include
"vtkPath.h"
#include
"vtkGenericCell.h"
#include
"vtkIdList.h"
#include
"vtkInformation.h"
#include
"vtkInformationVector.h"
...
...
@@ -50,6 +51,12 @@ void vtkPath::Allocate(vtkIdType size, int extSize)
this
->
PointData
->
Allocate
(
size
,
extSize
);
}
//----------------------------------------------------------------------------
void
vtkPath
::
GetCell
(
vtkIdType
,
vtkGenericCell
*
cell
)
{
cell
->
SetCellTypeToEmptyCell
();
}
//----------------------------------------------------------------------------
void
vtkPath
::
GetCellPoints
(
vtkIdType
,
vtkIdList
*
ptIds
)
{
...
...
Common/DataModel/vtkPath.h
View file @
97fc131d
...
...
@@ -74,7 +74,7 @@ public:
//vtkPath doesn't use cells. These methods return trivial values.
vtkIdType
GetNumberOfCells
()
{
return
0
;
}
vtkCell
*
GetCell
(
vtkIdType
)
{
return
NULL
;
}
void
GetCell
(
vtkIdType
,
vtkGenericCell
*
cell
)
{
cell
=
NULL
;
}
void
GetCell
(
vtkIdType
,
vtkGenericCell
*
);
int
GetCellType
(
vtkIdType
)
{
return
0
;
}
// Description:
...
...
Filters/ParallelFlowPaths/Testing/Cxx/TestPParticleTracers.cxx
View file @
97fc131d
...
...
@@ -405,8 +405,7 @@ int TestPParticlePathFilter(vtkMPIController* c)
vtkNew
<
vtkIdList
>
trace
;
lines
->
InitTraversal
();
lines
->
GetNextCell
(
trace
.
GetPointer
());
int
head
,
tail
;
head
=
trace
->
GetId
(
0
);
int
tail
;
tail
=
trace
->
GetId
(
trace
->
GetNumberOfIds
()
-
1
);
EXPECT
(
pd
->
GetArray
(
"Test"
)
->
GetTuple1
(
tail
)
==
3
,
pd
->
GetArray
(
"Test"
)
->
GetTuple1
(
tail
));
}
...
...
Filters/ParallelFlowPaths/vtkPStreamTracer.cxx
View file @
97fc131d
...
...
@@ -1632,8 +1632,7 @@ int vtkPStreamTracer::RequestData(
while
(
(
task
=
taskManager
.
NextTask
()))
{
iterations
++
;
int
res
=
this
->
CheckInputs
(
func
,
&
maxCellSize
);
AssertEq
(
res
,
VTK_OK
);
AssertEq
(
this
->
CheckInputs
(
func
,
&
maxCellSize
),
VTK_OK
);
PStreamTracerPoint
*
point
=
task
->
GetPoint
();
vtkSmartPointer
<
vtkPolyData
>
traceOut
;
...
...
IO/Image/vtkOggTheoraWriter.cxx
View file @
97fc131d
...
...
@@ -114,8 +114,8 @@ int vtkOggTheoraWriterInternal::Start()
th_info
thInfo
;
th_info_init
(
&
thInfo
);
// frame_width and frame_height must be multiples of 16
thInfo
.
frame_width
=
this
->
Dim
[
0
]
+
15
&~
0xF
;
thInfo
.
frame_height
=
this
->
Dim
[
1
]
+
15
&~
0xF
;
thInfo
.
frame_width
=
(
this
->
Dim
[
0
]
+
15
)
&~
0xF
;
thInfo
.
frame_height
=
(
this
->
Dim
[
1
]
+
15
)
&~
0xF
;
thInfo
.
pic_width
=
this
->
Dim
[
0
];
thInfo
.
pic_height
=
this
->
Dim
[
1
];
// force even offsets of the picture within the frame
...
...
Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostDividedEdgeBundling.cxx
View file @
97fc131d
...
...
@@ -150,7 +150,8 @@ vtkColor4ub vtkBundledGraphItem::EdgeColor(vtkIdType edgeIdx, vtkIdType pointIdx
}
//----------------------------------------------------------------------------
float
vtkBundledGraphItem
::
EdgeWidth
(
vtkIdType
lineIdx
,
vtkIdType
pointIdx
)
float
vtkBundledGraphItem
::
EdgeWidth
(
vtkIdType
vtkNotUsed
(
lineIdx
),
vtkIdType
vtkNotUsed
(
pointIdx
))
{
return
4.0
f
;
}
...
...
Rendering/FreeType/vtkFreeTypeTools.cxx
View file @
97fc131d
...
...
@@ -1298,7 +1298,6 @@ bool vtkFreeTypeTools::PopulatePath(vtkTextProperty *tprop,
{
short
contourEnd
=
outline
->
contours
[
contour
];
controlType
lastTag
=
FIRST_POINT
;
controlType
contourStartTag
;
double
contourStartVec
[
2
];
double
lastVec
[
2
];
for
(;
point
<=
contourEnd
;
++
point
)
...
...
@@ -1347,7 +1346,6 @@ bool vtkFreeTypeTools::PopulatePath(vtkTextProperty *tprop,
{
path
->
InsertNextPoint
(
vec
[
0
],
vec
[
1
],
0.0
,
vtkPath
::
MOVE_TO
);
lastTag
=
tag
;
contourStartTag
=
tag
;
lastVec
[
0
]
=
vec
[
0
];
lastVec
[
1
]
=
vec
[
1
];
contourStartVec
[
0
]
=
vec
[
0
];
...
...
Rendering/MathText/vtkMathTextActor.cxx
View file @
97fc131d
...
...
@@ -231,9 +231,9 @@ void vtkMathTextActor::ComputeRectangle()
double
s
=
sin
(
radians
);
double
xo
,
yo
;
double
x
,
y
;
double
maxWidth
,
maxHeight
;
double
maxHeight
;
xo
=
yo
=
0.0
;
maxWidth
=
maxHeight
=
0
;
maxHeight
=
0
;
switch
(
this
->
TextProperty
->
GetJustification
()
)
{
default:
...
...
Rendering/Matplotlib/Testing/Cxx/TestContextMathTextImage.cxx
View file @
97fc131d
...
...
@@ -37,7 +37,7 @@ public:
};
//----------------------------------------------------------------------------
int
TestContextMathTextImage
(
int
argc
,
char
*
argv
[])
int
TestContextMathTextImage
(
int
vtkNotUsed
(
argc
)
,
char
*
vtkNotUsed
(
argv
)
[])
{
// Set up a 2D context view, context test object and add it to the scene
vtkNew
<
vtkContextView
>
view
;
...
...
Rendering/Matplotlib/Testing/Cxx/TestRenderString.cxx
View file @
97fc131d
...
...
@@ -25,7 +25,7 @@
#include
"vtkTextProperty.h"
//----------------------------------------------------------------------------
int
TestRenderString
(
int
argc
,
char
*
argv
[])
int
TestRenderString
(
int
vtkNotUsed
(
argc
)
,
char
*
vtkNotUsed
(
argv
)
[])
{
const
char
*
str
=
"$
\\
hat{H}
\\
psi =
\\
left(-
\\
frac{
\\
hbar}{2m}
\\
nabla^2"
" + V(r)
\\
right)
\\
psi =
\\
psi
\\
cdot E $"
;
...
...
Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx
View file @
97fc131d
...
...
@@ -284,7 +284,7 @@ bool vtkMatplotlibMathTextUtilities::RenderString(const char *str,
long
int
rows
=
0
;
long
int
cols
=
0
;
long
int
ind
=
0
;
long
int
numPixels
=
0
;
//
long int numPixels = 0;
// matplotlib.mathtext seems to mishandle the dpi, this conversion makes the
// text size match the images produced by vtkFreeTypeUtilities, as well as the
// paths generated by StringToPath
...
...
@@ -341,7 +341,7 @@ bool vtkMatplotlibMathTextUtilities::RenderString(const char *str,
return
false
;
}
numPixels
=
PyObject_Length
(
list
.
GetPointer
());
//
numPixels = PyObject_Length(list.GetPointer());
if
(
this
->
CheckForError
())
{
return
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment