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

Merge branch 'master' into webp_more_tests

Browse source
This commit is contained in:
Blake Thompson 2017-06-05 09:50:53 -05:00
commit 4b69974175
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
benchmark/test_png_encoding2.cpp
View file

@ -3,7 +3,7 @@
class test : public benchmark::test_case class test : public benchmark::test_case
{ {
std::shared_ptr<image_rgba8> im_; std::shared_ptr<mapnik::image_rgba8> im_;
public: public:
test(mapnik::parameters const& params) test(mapnik::parameters const& params)
: test_case(params) { : test_case(params) {
@ -13,7 +13,7 @@ public:
{ {
throw mapnik::image_reader_exception("Failed to load: " + filename); throw mapnik::image_reader_exception("Failed to load: " + filename);
} }
im_ = std::make_shared<image_rgba8>(reader->width(),reader->height()); im_ = std::make_shared<mapnik::image_rgba8>(reader->width(),reader->height());
reader->read(0,0,*im_); reader->read(0,0,*im_);
} }
bool validate() const bool validate() const

4
src/agg/agg_renderer.cpp
View file

@ -250,9 +250,7 @@ void agg_renderer<T0,T1>::end_layer_processing(layer const& lyr)
{ {
composite_mode_e comp_op = lyr.comp_op() ? *lyr.comp_op() : src_over; composite_mode_e comp_op = lyr.comp_op() ? *lyr.comp_op() : src_over;
composite(previous_buffer, current_buffer, composite(previous_buffer, current_buffer,
comp_op, lyr.get_opacity(), comp_op, lyr.get_opacity(), 0, 0);
-common_.t_.offset(),
-common_.t_.offset());
internal_buffers_.pop(); internal_buffers_.pop();
} }
} }

2
test/data-visual

@ -1 +1 @@
Subproject commit 07f60172b0dbb70d261b520c499a8dd8daabe5a7 Subproject commit 0ca64e7760dfd6b1573b7a8c65ede3521a5ea5c3