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

Revert "cairo renderer: clear map background with given color as agg renderer does (#3718)"

Browse source 
This reverts commit 53249053e4.
This commit is contained in:
Dane Springmeyer 2017-09-10 10:30:18 -07:00
parent 76bec9b3fc
commit 6035296801
2 changed files with 0 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo/cairo_renderer.cpp
View file

@ -149,7 +149,6 @@ void cairo_renderer<T>::setup(Map const& map)
{ {
cairo_save_restore guard(context_); cairo_save_restore guard(context_);
context_.set_color(*bg); context_.set_color(*bg);
context_.set_operator(composite_mode_e::src);
context_.paint(); context_.paint();
} }
boost::optional<std::string> const& image_filename = map.background_image(); boost::optional<std::string> const& image_filename = map.background_image();

66
test/unit/map/background.cpp
View file

@ -1,66 +0,0 @@
#include "catch.hpp"
#include <mapnik/map.hpp>
#include <mapnik/agg_renderer.hpp>
#if defined(HAVE_CAIRO)
#include <mapnik/cairo/cairo_renderer.hpp>
#include <mapnik/cairo/cairo_image_util.hpp>
#endif
TEST_CASE("map") {
SECTION("set background - agg") {
mapnik::Map map(256, 256);
mapnik::image_rgba8 image(map.width(), map.height());
const mapnik::color c1(255, 0, 0);
mapnik::fill(image, c1);
CHECK(image(0, 0) == c1.rgba());
// Fully transparent black should replace red color
const mapnik::color c2(0, 0, 0, 0);
map.set_background(c2);
mapnik::agg_renderer<mapnik::image_rgba8> ren(map, image);
ren.apply();
CHECK(image(0, 0) == c2.rgba());
}
#if defined(HAVE_CAIRO)
SECTION("set background - cairo") {
mapnik::Map map(256, 256);
mapnik::cairo_surface_ptr image_surface(
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, map.width(), map.height()),
mapnik::cairo_surface_closer());
mapnik::cairo_ptr image_context(mapnik::create_context(image_surface));
cairo_set_source_rgba(image_context.get(), 1.0, 0.0, 0.0, 1.0);
cairo_paint(image_context.get());
{
mapnik::image_rgba8 image(map.width(), map.height());
mapnik::cairo_image_to_rgba8(image, image_surface);
const mapnik::color c1(255, 0, 0);
CHECK(image(0, 0) == c1.rgba());
}
// Fully transparent black should replace red color
const mapnik::color c2(0, 0, 0, 0);
map.set_background(c2);
mapnik::cairo_renderer<mapnik::cairo_ptr> ren(map, image_context, 1.0);
ren.apply();
{
mapnik::image_rgba8 image(map.width(), map.height());
mapnik::cairo_image_to_rgba8(image, image_surface);
CHECK(image(0, 0) == c2.rgba());
}
}
#endif
}