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/vertex.hpp>
#include <mapnik/geometry_types.hpp>
#include <mapnik/geometry.hpp>
// stl
#include <cmath>
#include <vector>

3
src/text/renderer.cpp
View file

@ -178,6 +178,8 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
if (!error)
{
FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(g);
if (bit->bitmap.pixel_mode != FT_PIXEL_MODE_BGRA)
{
composite_bitmap(pixmap_,
&bit->bitmap,
halo_fill,
@ -187,6 +189,7 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
halo_comp_op_);
}
}
}
else
{
error = FT_Glyph_To_Bitmap(&g, FT_RENDER_MODE_NORMAL, 0, 1);

2
test/data-visual

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