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

agg scaling assumes/requires a premulitiplied renderer (and optionally a source defined as premultiplied) - to avoid any confusion use purely premultiplied types - refs #1508 and #1489

Browse source
This commit is contained in:
Dane Springmeyer 2012-10-02 21:49:52 -07:00
parent 2e737e07b2
commit 1b5a1f0ffc
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/image_scaling.cpp
View file

@ -263,12 +263,12 @@ void scale_image_agg(Image & target,
double filter_radius, double filter_radius,
double ratio) double ratio)
{ {
// TODO - should all types here be *_pre ?
// "the image filters should work namely in the premultiplied color space" // "the image filters should work namely in the premultiplied color space"
// http://old.nabble.com/Re:--AGG--Basic-image-transformations-p1110665.html // http://old.nabble.com/Re:--AGG--Basic-image-transformations-p1110665.html
typedef agg::pixfmt_rgba32 pixfmt; // "Yes, you need to use premultiplied images only. Only in this case the simple weighted averaging works correctly in the image fitering."
// http://permalink.gmane.org/gmane.comp.graphics.agg/3443
typedef agg::pixfmt_rgba32_pre pixfmt_pre; typedef agg::pixfmt_rgba32_pre pixfmt_pre;
typedef agg::renderer_base<pixfmt_pre> renderer_base; typedef agg::renderer_base<pixfmt_pre> renderer_base_pre;
// define some stuff we'll use soon // define some stuff we'll use soon
agg::rasterizer_scanline_aa<> ras; agg::rasterizer_scanline_aa<> ras;
@ -278,15 +278,15 @@ void scale_image_agg(Image & target,
// initialize source AGG buffer // initialize source AGG buffer
agg::rendering_buffer rbuf_src((unsigned char*)source.getBytes(), source.width(), source.height(), source.width() * 4); agg::rendering_buffer rbuf_src((unsigned char*)source.getBytes(), source.width(), source.height(), source.width() * 4);
pixfmt pixf_src(rbuf_src); pixfmt_pre pixf_src(rbuf_src);
typedef agg::image_accessor_clone<pixfmt> img_src_type; typedef agg::image_accessor_clone<pixfmt_pre> img_src_type;
img_src_type img_src(pixf_src); img_src_type img_src(pixf_src);
// initialize destination AGG buffer (with transparency) // initialize destination AGG buffer (with transparency)
agg::rendering_buffer rbuf_dst((unsigned char*)target.getBytes(), target.width(), target.height(), target.width() * 4); agg::rendering_buffer rbuf_dst((unsigned char*)target.getBytes(), target.width(), target.height(), target.width() * 4);
pixfmt_pre pixf_dst(rbuf_dst); pixfmt_pre pixf_dst(rbuf_dst);
renderer_base rb_dst(pixf_dst); renderer_base_pre rb_dst_pre(pixf_dst);
rb_dst.clear(agg::rgba(0, 0, 0, 0)); rb_dst_pre.clear(agg::rgba(0, 0, 0, 0));
// create a scaling matrix // create a scaling matrix
agg::trans_affine img_mtx; agg::trans_affine img_mtx;
@ -311,7 +311,7 @@ void scale_image_agg(Image & target,
{ {
typedef agg::span_image_filter_rgba_nn<img_src_type, interpolator_type> span_gen_type; typedef agg::span_image_filter_rgba_nn<img_src_type, interpolator_type> span_gen_type;
span_gen_type sg(img_src, interpolator); span_gen_type sg(img_src, interpolator);
agg::render_scanlines_aa(ras, sl, rb_dst, sa, sg); agg::render_scanlines_aa(ras, sl, rb_dst_pre, sa, sg);
return; return;
} }
case SCALING_BILINEAR: case SCALING_BILINEAR:
@ -348,9 +348,21 @@ void scale_image_agg(Image & target,
case SCALING_BLACKMAN: case SCALING_BLACKMAN:
filter.calculate(agg::image_filter_blackman(filter_radius), true); break; filter.calculate(agg::image_filter_blackman(filter_radius), true); break;
} }
// details on various resampling considerations
// http://old.nabble.com/Re%3A-Newbie---texture-p5057255.html
// high quality resampler
//typedef agg::span_image_resample_rgba_affine<img_src_type> span_gen_type;
// faster, lower quality
//typedef agg::span_image_filter_rgba<img_src_type,interpolator_type> span_gen_type;
// local, modified agg::span_image_resample_rgba_affine
// not convinced we need this
// https://github.com/mapnik/mapnik/issues/1489
typedef mapnik::span_image_resample_rgba_affine<img_src_type> span_gen_type; typedef mapnik::span_image_resample_rgba_affine<img_src_type> span_gen_type;
span_gen_type sg(img_src, interpolator, filter); span_gen_type sg(img_src, interpolator, filter);
agg::render_scanlines_aa(ras, sl, rb_dst, sa, sg); agg::render_scanlines_aa(ras, sl, rb_dst_pre, sa, sg);
} }
template void scale_image_agg<image_data_32> (image_data_32& target,const image_data_32& source, scaling_method_e scaling_method, double scale_factor, double x_off_f, double y_off_f, double filter_radius, double ratio); template void scale_image_agg<image_data_32> (image_data_32& target,const image_data_32& source, scaling_method_e scaling_method, double scale_factor, double x_off_f, double y_off_f, double filter_radius, double ratio);