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

Revert "check if FT_PIXEL_MODE_BGRA is defined (freetype < 2.5.0) (#3797)"

Browse source 
This reverts commit 6eafffaf57.
Revert "fix memory leak (#3775)"
This reverts commit 995ab49f23.

(6eafffaf57 (commitcomment-25894906))
This commit is contained in:
Artem Pavlenko 2017-11-28 14:10:48 +01:00
parent 6eafffaf57
commit 6a6891252c
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/geom_util.hpp
View file

@ -28,7 +28,6 @@
#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>

19
src/text/renderer.cpp
View file

@ -178,18 +178,13 @@ 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);
#ifdef FT_PIXEL_MODE_BGRA composite_bitmap(pixmap_,
if (bit->bitmap.pixel_mode != FT_PIXEL_MODE_BGRA) &bit->bitmap,
#endif halo_fill,
{ bit->left,
composite_bitmap(pixmap_, height - bit->top,
&bit->bitmap, halo_opacity,
halo_fill, halo_comp_op_);
bit->left,
height - bit->top,
halo_opacity,
halo_comp_op_);
}
} }
} }
else else

2
test/data-visual

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