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

Revert "no need for premultiplied types in warper"

Browse source 
This reverts commit 61e8a9c236.
This commit is contained in:
Dane Springmeyer 2012-09-14 18:42:47 -07:00
parent 657098fd48
commit f3589ab4f9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/warp.cpp
View file

@ -78,6 +78,8 @@ void reproject_and_scale_raster(raster & target, raster const& source,
typedef agg::pixfmt_rgba32 pixfmt; typedef agg::pixfmt_rgba32 pixfmt;
typedef pixfmt::color_type color_type; typedef pixfmt::color_type color_type;
typedef agg::renderer_base<pixfmt> renderer_base; typedef agg::renderer_base<pixfmt> renderer_base;
typedef agg::pixfmt_rgba32_pre pixfmt_pre;
typedef agg::renderer_base<pixfmt_pre> renderer_base_pre;
agg::rasterizer_scanline_aa<> rasterizer; agg::rasterizer_scanline_aa<> rasterizer;
agg::scanline_u8 scanline; agg::scanline_u8 scanline;
@ -85,8 +87,8 @@ void reproject_and_scale_raster(raster & target, raster const& source,
target.data_.width(), target.data_.width(),
target.data_.height(), target.data_.height(),
target.data_.width()*4); target.data_.width()*4);
pixfmt pixf(buf); pixfmt_pre pixf_pre(buf);
renderer_base rb(pixf); renderer_base_pre rb_pre(pixf_pre);
rasterizer.clip_box(0, 0, target.data_.width(), target.data_.height()); rasterizer.clip_box(0, 0, target.data_.width(), target.data_.height());
agg::rendering_buffer buf_tile( agg::rendering_buffer buf_tile(
(unsigned char*)source.data_.getData(), (unsigned char*)source.data_.getData(),
@ -176,13 +178,13 @@ void reproject_and_scale_raster(raster & target, raster const& source,
<img_accessor_type, interpolator_type> <img_accessor_type, interpolator_type>
span_gen_type; span_gen_type;
span_gen_type sg(ia, interpolator); span_gen_type sg(ia, interpolator);
agg::render_scanlines_aa(rasterizer, scanline, rb, agg::render_scanlines_aa(rasterizer, scanline, rb_pre,
sa, sg); sa, sg);
} else { } else {
typedef mapnik::span_image_resample_rgba_affine typedef mapnik::span_image_resample_rgba_affine
<img_accessor_type> span_gen_type; <img_accessor_type> span_gen_type;
span_gen_type sg(ia, interpolator, filter); span_gen_type sg(ia, interpolator, filter);
agg::render_scanlines_aa(rasterizer, scanline, rb, agg::render_scanlines_aa(rasterizer, scanline, rb_pre,
sa, sg); sa, sg);
} }
} }