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

fix memory leak (#3775)

Browse source
This commit is contained in:
talaj 2017-10-06 09:27:58 +02:00 committed by Artem Pavlenko
parent 5996fb07ec
commit 995ab49f23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/geom_util.hpp
View file

@ -28,6 +28,7 @@
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry_types.hpp>
#include <mapnik/geometry.hpp>
// stl // stl
#include <cmath> #include <cmath>
#include <vector> #include <vector>

17
src/text/renderer.cpp
View file

@ -178,13 +178,16 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
if (!error) if (!error)
{ {
FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(g); FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(g);
composite_bitmap(pixmap_, if (bit->bitmap.pixel_mode != FT_PIXEL_MODE_BGRA)
&bit->bitmap, {
halo_fill, composite_bitmap(pixmap_,
bit->left, &bit->bitmap,
height - bit->top, halo_fill,
halo_opacity, bit->left,
halo_comp_op_); height - bit->top,
halo_opacity,
halo_comp_op_);
}
} }
} }
else else

2
test/data-visual

@ -1 +1 @@
Subproject commit a2624810e3f8d187af2ec0995bcfba0ef61d00d9 Subproject commit 2749835d3265d95b951c2c90c099fac35e326f39