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

no need for premultiplied types in warper

Browse source
This commit is contained in:
Dane Springmeyer 2012-09-12 13:22:37 -07:00
parent 1b4e7a8fd5
commit 61e8a9c236
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/warp.cpp
View file

@ -78,8 +78,6 @@ 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;
@ -87,8 +85,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_pre pixf_pre(buf); pixfmt pixf(buf);
renderer_base_pre rb_pre(pixf_pre); renderer_base rb(pixf);
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(),
@ -178,13 +176,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_pre, agg::render_scanlines_aa(rasterizer, scanline, rb,
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_pre, agg::render_scanlines_aa(rasterizer, scanline, rb,
sa, sg); sa, sg);
} }
} }