Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
0817a792
Commit
0817a792
authored
Jan 23, 2014
by
Sebastian Pölsterl
Browse files
Fixed comparison between signed and unsigned integer expressions [-Wsign-compare]
parent
f71fa18c
Changes
4
Hide whitespace changes
Inline
Side-by-side
application/gui/datacontainerinspectorcanvas.cpp
View file @
0817a792
...
...
@@ -486,7 +486,7 @@ namespace campvis {
_selectedTexture
=
(
selectedIndex
.
y
*
_numTiles
.
x
)
+
selectedIndex
.
x
;
for
(;
geomTexInfoIter
!=
_geomTextureInfos
.
end
();
geomTexInfoIter
++
)
{
if
((
*
geomTexInfoIter
).
_trackballIndx
==
_selectedTexture
)
{
if
(
static_cast
<
size_t
>
((
*
geomTexInfoIter
).
_trackballIndx
)
==
_selectedTexture
)
{
_selectedTrackball
=
(
*
geomTexInfoIter
).
_trackballIndx
;
break
;
}
...
...
@@ -655,4 +655,4 @@ namespace campvis {
invalidateMeshGeomTextures
();
}
}
}
\ No newline at end of file
}
modules/advancedusvis/processors/advancedusfusion.cpp
View file @
0817a792
...
...
@@ -160,7 +160,7 @@ namespace campvis {
p_transferFunction
.
setImageHandle
(
img
.
getDataHandle
());
const
tgt
::
svec3
&
imgSize
=
img
->
getSize
();
if
(
p_sliceNumber
.
getMaxValue
()
!=
imgSize
.
z
-
1
){
if
(
static_cast
<
tgt
::
svec3
::
ElemType
>
(
p_sliceNumber
.
getMaxValue
()
)
!=
imgSize
.
z
-
1
){
p_sliceNumber
.
setMaxValue
(
static_cast
<
int
>
(
imgSize
.
z
)
-
1
);
}
p_use3DTexture
.
setValue
(
img
->
getDimensionality
()
==
3
);
...
...
modules/preprocessing/processors/glgradientvolumegenerator.cpp
View file @
0817a792
...
...
@@ -95,7 +95,7 @@ namespace campvis {
glViewport
(
0
,
0
,
static_cast
<
GLsizei
>
(
size
.
x
),
static_cast
<
GLsizei
>
(
size
.
y
));
// render quad to compute difference measure by shader
for
(
int
z
=
0
;
z
<
size
.
z
;
++
z
)
{
for
(
tgt
::
svec3
::
ElemType
z
=
0
;
z
<
size
.
z
;
++
z
)
{
float
zTexCoord
=
static_cast
<
float
>
(
z
)
/
static_cast
<
float
>
(
size
.
z
)
+
.5
f
/
static_cast
<
float
>
(
size
.
z
);
_shader
->
setUniform
(
"_zTexCoord"
,
zTexCoord
);
_fbo
->
attachTexture
(
resultTexture
,
GL_COLOR_ATTACHMENT0
,
0
,
z
);
...
...
modules/registration/processors/similaritymeasure.cpp
View file @
0817a792
...
...
@@ -320,7 +320,7 @@ namespace campvis {
glViewport
(
0
,
0
,
static_cast
<
GLsizei
>
(
viewportSize
.
x
),
static_cast
<
GLsizei
>
(
viewportSize
.
y
));
// render quad to compute difference measure by shader
for
(
int
z
=
0
;
z
<
size
.
z
;
++
z
)
{
for
(
tgt
::
svec3
::
ElemType
z
=
0
;
z
<
size
.
z
;
++
z
)
{
float
texZ
=
static_cast
<
float
>
(
z
)
/
static_cast
<
float
>
(
size
.
z
)
+
.5
f
/
static_cast
<
float
>
(
size
.
z
);
_differenceShader
->
setUniform
(
"_zTex"
,
texZ
);
_fbo
->
attachTexture
(
differenceImage
,
GL_COLOR_ATTACHMENT0
,
0
,
z
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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