Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use helper function strToDouble for locale independent parsing of colors #47

Merged
merged 2 commits into from
Nov 14, 2018
Merged

use helper function strToDouble for locale independent parsing of colors #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6c943
use helper function strToDouble for locale independent parsing of colors
simonschmeisser Oct 24, 2018
955edc3
Add range check for color components being within [0, 1]
simonschmeisser Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions urdf_model/include/urdf_model/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ class Color
{
try
{
rgba.push_back(std::stof(pieces[i]));
double piece = strToDouble(pieces[i].c_str());
if ((piece < 0) || (piece > 1))
throw ParseError("Component [" + pieces[i] + "] is outside the valid range for colors [0, 1]");
rgba.push_back(piece);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this line warns on windows

c:\j\workspace\ci_packaging_windows\ws\install\include\urdf_model\color.h(79): warning C4244: 'argument': conversion from 'double' to 'const float', possible loss of data [C:\J\workspace\ci_packaging_windows\ws\build\robot_state_publisher\robot_state_publisher_solver.vcxproj

https://ci.ros2.org/job/ci_packaging_windows/82

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ug. Well, I guess we can static_cast<float> here; we know it will be safe.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#48

}
catch (std::invalid_argument &/*e*/) {
return false;
}
catch (std::out_of_range &/*e*/) {
return false;
catch (std::runtime_error &/*e*/) {
throw ParseError("Unable to parse component [" + pieces[i] + "] to a double (while parsing a color value)");
}
}
}
Expand Down