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

c++11 - use constexpr

Browse source
This commit is contained in:
artemp 2014-12-16 10:17:05 +01:00
parent 979d706c26
commit ecf9a686a3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/image_scaling.cpp
View file

@ -114,6 +114,7 @@ void scale_image_agg(T & target, T const& source, scaling_method_e scaling_metho
using img_src_type = typename detail::agg_scaling_traits<image_data_type>::img_src_type; using img_src_type = typename detail::agg_scaling_traits<image_data_type>::img_src_type;
using interpolator_type = typename detail::agg_scaling_traits<image_data_type>::interpolator_type; using interpolator_type = typename detail::agg_scaling_traits<image_data_type>::interpolator_type;
using renderer_base_pre = agg::renderer_base<pixfmt_pre>; using renderer_base_pre = agg::renderer_base<pixfmt_pre>;
constexpr std::size_t pixel_size = sizeof(pixel_size);
// define some stuff we'll use soon // define some stuff we'll use soon
agg::rasterizer_scanline_aa<> ras; agg::rasterizer_scanline_aa<> ras;
@ -122,13 +123,13 @@ void scale_image_agg(T & target, T const& source, scaling_method_e scaling_metho
agg::image_filter_lut filter; agg::image_filter_lut filter;
// initialize source AGG buffer // initialize source AGG buffer
agg::rendering_buffer rbuf_src(const_cast<unsigned char*>(source.getBytes()), source.width(), source.height(), source.width() * sizeof(pixel_type)); agg::rendering_buffer rbuf_src(const_cast<unsigned char*>(source.getBytes()), source.width(), source.height(), source.width() * pixel_size);
pixfmt_pre pixf_src(rbuf_src); pixfmt_pre pixf_src(rbuf_src);
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(target.getBytes(), target.width(), target.height(), target.width() * sizeof(pixel_type)); agg::rendering_buffer rbuf_dst(target.getBytes(), target.width(), target.height(), target.width() * pixel_size);
pixfmt_pre pixf_dst(rbuf_dst); pixfmt_pre pixf_dst(rbuf_dst);
renderer_base_pre rb_dst_pre(pixf_dst); renderer_base_pre rb_dst_pre(pixf_dst);