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

raster scaling: check for division by zero

Browse source
This commit is contained in:
Jiri Drbalek 2016-03-04 15:13:55 +00:00 committed by artemp
parent 53c643092c
commit 93a34cc68d
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/mapnik/span_image_filter.hpp
View file

@ -131,19 +131,27 @@ public:
fg_ptr = reinterpret_cast<const value_type*>(base_type::source().next_y()); fg_ptr = reinterpret_cast<const value_type*>(base_type::source().next_y());
} }
fg /= total_weight; if (total_weight == 0)
if (fg < std::numeric_limits<value_type>::min())
{ {
span->v = std::numeric_limits<value_type>::min(); span->v = *nodata_value_;
}
else if (fg > std::numeric_limits<value_type>::max())
{
span->v = std::numeric_limits<value_type>::max();
} }
else else
{ {
span->v = static_cast<value_type>(fg); 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->a = base_mask; span->a = base_mask;
++span; ++span;