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

skewX/skewY - add input validation ref https://github.com/mapbox/mapbox-studio/issues/1409

Browse source 
* convert input angle into -90,90 range
* clamp to -89,89 range
This commit is contained in:
artemp 2015-07-14 11:53:50 +02:00
parent c2295755f6
commit 6d6cb15b45
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/transform_processor.hpp
View file

@ -31,6 +31,10 @@
#include <mapnik/util/variant.hpp>
// agg
#include <agg_trans_affine.h>
// boost
#include <boost/algorithm/clamp.hpp>
// stl
#include <cmath>
namespace mapnik {
@ -149,13 +153,15 @@ struct transform_processor
void operator() (skewX_node const& node)
{
double angle = deg2rad(eval(node.angle_));
auto degrees = std::fmod(eval(node.angle_),90.0);
auto angle = deg2rad(boost::algorithm::clamp(degrees, -89.0, 89.0));
transform_.multiply(agg::trans_affine_skewing(angle, 0.0));
}
void operator() (skewY_node const& node)
{
double angle = deg2rad(eval(node.angle_));
auto degrees = std::fmod(eval(node.angle_),90.0);
auto angle = deg2rad(boost::algorithm::clamp(degrees, -89.0, 89.0));
transform_.multiply(agg::trans_affine_skewing(0.0, angle));
}