Commit 32829e5b authored by Jan Möbius's avatar Jan Möbius

Changed color translator to use size_t

parent 60b2ff02
...@@ -270,7 +270,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -270,7 +270,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
rgba[2] = pixels[hit][2]; rgba[2] = pixels[hit][2];
rgba[3] = pixels[hit][3]; rgba[3] = pixels[hit][3];
std::vector<unsigned int> 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 ? // something wrong with the color stack ?
if (rv.size () < 2) if (rv.size () < 2)
...@@ -394,7 +394,7 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -394,7 +394,7 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget,
rgba[2] = pixels[hit][2]; rgba[2] = pixels[hit][2];
rgba[3] = pixels[hit][3]; rgba[3] = pixels[hit][3];
std::vector<unsigned int> 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 ? // something wrong with the color stack ?
if (rv.size () < 2) if (rv.size () < 2)
...@@ -561,7 +561,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg ...@@ -561,7 +561,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg
rgba[2] = buffer[bPos + 2]; rgba[2] = buffer[bPos + 2];
rgba[3] = buffer[bPos + 3]; rgba[3] = buffer[bPos + 3];
std::vector<unsigned int> rv = properties_.glState().pick_color_to_stack (rgba); std::vector<size_t> rv = properties_.glState().pick_color_to_stack (rgba);
if (rv.size () < 2) if (rv.size () < 2)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment