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

raster scaling: use mapnik::safe_cast, fixes clipping negative floats

Browse source
This commit is contained in:
Jiri Drbalek 2016-03-04 16:59:12 +00:00 committed by artemp
parent 9b72dd868f
commit 348067dcfd
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/span_image_filter.hpp
View file

@ -30,6 +30,8 @@
#include <limits>
#include <mapnik/safe_cast.hpp>
namespace mapnik
{
@ -140,19 +142,7 @@ public:
}
else
{
fg /= total_weight;
if (fg < std::numeric_limits<value_type>::min())
{
span->v = std::numeric_limits<value_type>::min();
}
else if (fg > std::numeric_limits<value_type>::max())
{
span->v = std::numeric_limits<value_type>::max();
}
else
{
span->v = static_cast<value_type>(fg);
}
span->v = safe_cast<value_type>(fg / total_weight);
}
span->a = base_mask;