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

Merge pull request #3121 from mapnik/revert-3118-fix-gray-scaling

Browse source 
Revert "fix scaling gray images"
This commit is contained in:
Jiri Drbalek 2015-10-12 15:34:33 +02:00
commit 33e7ed5124
1 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
include/mapnik/renderer_common/process_raster_symbolizer.hpp
View file

@ -89,29 +89,21 @@ struct image_dispatcher
template <typename T> template <typename T>
void operator() (T const& data_in) const void operator() (T const& data_in) const
{ {
image_rgba8 colorized(data_in.width(), data_in.height()); using image_type = T;
image_rgba8 dst(width_, height_);
raster_colorizer_ptr colorizer = get<raster_colorizer_ptr>(sym_, keys::colorizer); raster_colorizer_ptr colorizer = get<raster_colorizer_ptr>(sym_, keys::colorizer);
if (colorizer)
{
colorizer->colorize(colorized, data_in, nodata_, feature_);
}
else
{
// TODO: Apply some decent auto colorization...
return;
}
if (need_scaling_) if (need_scaling_)
{ {
image_rgba8 scaled(width_, height_); image_type data_out(width_, height_);
scale_image_agg(scaled, colorized, method_, scale_x_, scale_y_, 0.0, 0.0, filter_factor_); scale_image_agg(data_out, data_in, method_, scale_x_, scale_y_, 0.0, 0.0, filter_factor_);
premultiply_alpha(scaled); if (colorizer) colorizer->colorize(dst, data_out, nodata_, feature_);
composite_(scaled, comp_op_, opacity_, start_x_, start_y_);
} }
else else
{ {
premultiply_alpha(colorized); if (colorizer) colorizer->colorize(dst, data_in, nodata_, feature_);
composite_(colorized, comp_op_, opacity_, start_x_, start_y_);
} }
premultiply_alpha(dst);
composite_(dst, comp_op_, opacity_, start_x_, start_y_);
} }
private: private:
int start_x_; int start_x_;
@ -172,21 +164,15 @@ struct image_warp_dispatcher
template <typename T> template <typename T>
void operator() (T const& data_in) const void operator() (T const& data_in) const
{ {
image_rgba8 colorized(data_in.width(), data_in.height()); using image_type = T;
image_type data_out(width_, height_);
if (nodata_) data_out.set(*nodata_);
warp_image(data_out, data_in, prj_trans_, target_ext_, source_ext_, offset_x_, offset_y_, mesh_size_, scaling_method_, filter_factor_);
image_rgba8 dst(width_, height_);
raster_colorizer_ptr colorizer = get<raster_colorizer_ptr>(sym_, keys::colorizer); raster_colorizer_ptr colorizer = get<raster_colorizer_ptr>(sym_, keys::colorizer);
if (colorizer) if (colorizer) colorizer->colorize(dst, data_out, nodata_, feature_);
{ premultiply_alpha(dst);
colorizer->colorize(colorized, data_in, nodata_, feature_); composite_(dst, comp_op_, opacity_, start_x_, start_y_);
}
else
{
// TODO: Apply some decent auto colorization...
return;
}
image_rgba8 warped(width_, height_);
warp_image(warped, colorized, prj_trans_, target_ext_, source_ext_, offset_x_, offset_y_, mesh_size_, scaling_method_, filter_factor_);
premultiply_alpha(warped);
composite_(warped, comp_op_, opacity_, start_x_, start_y_);
} }
private: private:
proj_transform const& prj_trans_; proj_transform const& prj_trans_;