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

add scale_image_agg' and reproject_and_scale_raster` overloads for backward caps

Browse source
This commit is contained in:
artemp 2015-11-19 12:26:16 +00:00
parent 7d8f7357ed
commit da617f92eb
4 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/image_scaling.hpp
View file

@ -69,6 +69,20 @@ MAPNIK_DECL void scale_image_agg(T & target, T const& source,
double y_off_f, double y_off_f,
double filter_factor, double filter_factor,
boost::optional<double> const & nodata_value); boost::optional<double> const & nodata_value);
template <typename T>
MAPNIK_DECL void scale_image_agg(T & target, T const& source,
scaling_method_e scaling_method,
double image_ratio_x,
double image_ratio_y,
double x_off_f,
double y_off_f,
double filter_factor)
{
scale_image_agg(target, source, scaling_method,
image_ratio_x,image_ratio_y,
x_off_f, y_off_f, filter_factor,
boost::optional<double>());
}
} }
#endif // MAPNIK_IMAGE_SCALING_HPP #endif // MAPNIK_IMAGE_SCALING_HPP

8
include/mapnik/warp.hpp
View file

@ -38,8 +38,14 @@ MAPNIK_DECL void reproject_and_scale_raster(raster & target,
proj_transform const& prj_trans, proj_transform const& prj_trans,
double offset_x, double offset_y, double offset_x, double offset_y,
unsigned mesh_size, unsigned mesh_size,
scaling_method_e scaling_method); scaling_method_e scaling_method,
boost::optional<double> const & nodata_value);
MAPNIK_DECL void reproject_and_scale_raster(raster & target, raster const& source,
proj_transform const& prj_trans,
double offset_x, double offset_y,
unsigned mesh_size,
scaling_method_e scaling_method);
template <typename T> template <typename T>
MAPNIK_DECL void warp_image (T & target, T const& source, proj_transform const& prj_trans, MAPNIK_DECL void warp_image (T & target, T const& source, proj_transform const& prj_trans,

2
src/map.cpp
View file

@ -580,7 +580,7 @@ void Map::zoom_all()
void Map::zoom_to_box(box2d<double> const& box) void Map::zoom_to_box(box2d<double> const& box)
{ {
current_extent_=box; current_extent_= box;
fixAspectRatio(); fixAspectRatio();
} }

14
src/warp.cpp
View file

@ -221,6 +221,20 @@ void reproject_and_scale_raster(raster & target, raster const& source,
util::apply_visitor(warper, source.data_); util::apply_visitor(warper, source.data_);
} }
void reproject_and_scale_raster(raster & target, raster const& source,
proj_transform const& prj_trans,
double offset_x, double offset_y,
unsigned mesh_size,
scaling_method_e scaling_method)
{
reproject_and_scale_raster(target, source, prj_trans,
offset_x, offset_y,
mesh_size,
scaling_method,
boost::optional<double>());
}
template MAPNIK_DECL void warp_image (image_rgba8&, image_rgba8 const&, proj_transform const&, template MAPNIK_DECL void warp_image (image_rgba8&, image_rgba8 const&, proj_transform const&,
box2d<double> const&, box2d<double> const&, double, double, unsigned, scaling_method_e, double, boost::optional<double> const &); box2d<double> const&, box2d<double> const&, double, double, unsigned, scaling_method_e, double, boost::optional<double> const &);