Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
32829e5b
Commit
32829e5b
authored
Oct 21, 2016
by
Jan Möbius
Browse files
Changed color translator to use size_t
parent
60b2ff02
Changes
1
Hide whitespace changes
Inline
Side-by-side
widgets/glWidget/QtBaseViewerPicking.cc
View file @
32829e5b
...
...
@@ -270,7 +270,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
rgba
[
2
]
=
pixels
[
hit
][
2
];
rgba
[
3
]
=
pixels
[
hit
][
3
];
std
::
vector
<
unsigned
in
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
std
::
vector
<
size_
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
// something wrong with the color stack ?
if
(
rv
.
size
()
<
2
)
...
...
@@ -394,7 +394,7 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget,
rgba
[
2
]
=
pixels
[
hit
][
2
];
rgba
[
3
]
=
pixels
[
hit
][
3
];
std
::
vector
<
unsigned
in
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
std
::
vector
<
size_
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
// something wrong with the color stack ?
if
(
rv
.
size
()
<
2
)
...
...
@@ -561,7 +561,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg
rgba
[
2
]
=
buffer
[
bPos
+
2
];
rgba
[
3
]
=
buffer
[
bPos
+
3
];
std
::
vector
<
unsigned
in
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
std
::
vector
<
size_
t
>
rv
=
properties_
.
glState
().
pick_color_to_stack
(
rgba
);
if
(
rv
.
size
()
<
2
)
continue
;
...
...
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