sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix std:: prefixing for cmath

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-30 15:13:34 -07:00
parent 7e74967282
commit a8017ddae6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/group/group_symbolizer_helper.cpp
View file

@ -180,7 +180,7 @@ double group_symbolizer_helper::get_spacing(double path_length) const
int num_labels = 1;
if (placement_->properties.label_spacing > 0)
{
num_labels = static_cast<int>(floor(
num_labels = static_cast<int>(std::floor(
path_length / (placement_->properties.label_spacing * scale_factor_)));
}
if (num_labels <= 0)

2
src/text/placement_finder.cpp
View file

@ -301,7 +301,7 @@ double placement_finder::get_spacing(double path_length, double layout_width) co
int num_labels = 1;
if (info_.properties.label_spacing > 0)
{
num_labels = static_cast<int>(floor(
num_labels = static_cast<int>(std::floor(
path_length / (info_.properties.label_spacing * scale_factor_ + layout_width)));
}
if (num_labels <= 0)

6
src/text/vertex_cache.cpp
View file

@ -39,7 +39,7 @@ double vertex_cache::angle(double width)
//Only calculate angle on request as it is expensive
if (!angle_valid_)
{
angle_ = atan2(-(current_segment_->pos.y - segment_starting_point_.y),
angle_ = std::atan2(-(current_segment_->pos.y - segment_starting_point_.y),
current_segment_->pos.x - segment_starting_point_.x);
}
return width >= 0 ? angle_ : angle_ + M_PI;
@ -48,7 +48,7 @@ double vertex_cache::angle(double width)
scoped_state s(*this);
pixel_position const& old_pos = s.get_state().position();
move(width);
double angle = atan2(-(current_position_.y - old_pos.y),
double angle = std::atan2(-(current_position_.y - old_pos.y),
current_position_.x - old_pos.x);
return angle;
}
@ -111,7 +111,7 @@ bool vertex_cache::previous_segment()
vertex_cache & vertex_cache::get_offseted(double offset, double region_width)
{
if (fabs(offset) < 0.01)
if (std::fabs(offset) < 0.01)
{
return *this;
}