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

better bounds checking

Browse source
This commit is contained in:
Alberto Valverde 2011-09-14 00:13:46 +00:00
parent 785303f2dc
commit ad31aa717a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/agg/process_raster_symbolizer.cpp
View file

@ -110,6 +110,10 @@ static inline void resample_raster(raster &target, raster const& source,
for (i=0; i<mesh_nx-1; i++) { for (i=0; i<mesh_nx-1; i++) {
box2d<double> win(xs(i,j), ys(i,j), xs(i+1,j+1), ys(i+1,j+1)); box2d<double> win(xs(i,j), ys(i,j), xs(i+1,j+1), ys(i+1,j+1));
win = tt.forward(win); win = tt.forward(win);
if (!(win.maxx() < target.data_.width() &&
win.maxy() < target.data_.height())
) continue;
double polygon[8] = {win.minx(), win.miny(), double polygon[8] = {win.minx(), win.miny(),
win.maxx(), win.miny(), win.maxx(), win.miny(),
win.maxx(), win.maxy(), win.maxx(), win.maxy(),
@ -140,8 +144,10 @@ static inline void resample_raster(raster &target, raster const& source,
unsigned x1 = (i+1) * mesh_size; unsigned x1 = (i+1) * mesh_size;
unsigned y1 = (j+1) * mesh_size; unsigned y1 = (j+1) * mesh_size;
agg::trans_bilinear tr(polygon, x0, y0, x1, y1); if (!(x1 < source.data_.width() &&
y1 < source.data_.height())) continue;
agg::trans_bilinear tr(polygon, x0, y0, x1, y1);
if (tr.is_valid()) if (tr.is_valid())
{ {
typedef agg::span_interpolator_linear<agg::trans_bilinear> typedef agg::span_interpolator_linear<agg::trans_bilinear>