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

use math functions from std::

Browse source
This commit is contained in:
Dane Springmeyer 2014-05-28 07:52:55 -07:00
parent c87cf109a6
commit 93e1b74c82
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/text_placements/simple.cpp
View file

@ -33,6 +33,8 @@
#include <boost/make_shared.hpp>
#include <boost/property_tree/ptree.hpp>
#include <cmath>
namespace mapnik
{
@ -72,28 +74,28 @@ bool text_placement_info_simple::next_position_only()
displacement = pdisp;
break;
case NORTH:
displacement = std::make_pair(0, -abs(pdisp.second));
displacement = std::make_pair(0, -std::abs(pdisp.second));
break;
case EAST:
displacement = std::make_pair(abs(pdisp.first), 0);
displacement = std::make_pair(std::abs(pdisp.first), 0);
break;
case SOUTH:
displacement = std::make_pair(0, abs(pdisp.second));
displacement = std::make_pair(0, std::abs(pdisp.second));
break;
case WEST:
displacement = std::make_pair(-abs(pdisp.first), 0);
displacement = std::make_pair(-std::abs(pdisp.first), 0);
break;
case NORTHEAST:
displacement = std::make_pair(abs(pdisp.first), -abs(pdisp.second));
displacement = std::make_pair(std::abs(pdisp.first), -std::abs(pdisp.second));
break;
case SOUTHEAST:
displacement = std::make_pair(abs(pdisp.first), abs(pdisp.second));
displacement = std::make_pair(std::abs(pdisp.first), std::abs(pdisp.second));
break;
case NORTHWEST:
displacement = std::make_pair(-abs(pdisp.first), -abs(pdisp.second));
displacement = std::make_pair(-std::abs(pdisp.first), -std::abs(pdisp.second));
break;
case SOUTHWEST:
displacement = std::make_pair(-abs(pdisp.first), abs(pdisp.second));
displacement = std::make_pair(-std::abs(pdisp.first), std::abs(pdisp.second));
break;
default:
MAPNIK_LOG_WARN(text_placements) << "Unknown placement";