From 6a6891252cf12f22019d73a10c58acd166b22b70 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Tue, 28 Nov 2017 14:10:48 +0100
Subject: [PATCH] Revert "check if FT_PIXEL_MODE_BGRA is defined (freetype <
 2.5.0) (#3797)" This reverts commit 6eafffaf57581f4e22405e7ae22c5d54555a285b.
 Revert "fix memory leak (#3775)" This reverts commit
 995ab49f23b1815b05cfb5b16ebe1f915451c275.

(https://github.com/mapnik/mapnik/commit/6eafffaf57581f4e22405e7ae22c5d54555a285b#commitcomment-25894906)
---
 include/mapnik/geom_util.hpp |  1 -
 src/text/renderer.cpp        | 19 +++++++------------
 test/data-visual             |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index d16c42eee..9311139e5 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -28,7 +28,6 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/vertex.hpp>
 #include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry.hpp>
 // stl
 #include <cmath>
 #include <vector>
diff --git a/src/text/renderer.cpp b/src/text/renderer.cpp
index e45077125..163d11c6f 100644
--- a/src/text/renderer.cpp
+++ b/src/text/renderer.cpp
@@ -178,18 +178,13 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
                 if (!error)
                 {
                     FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(g);
-#ifdef FT_PIXEL_MODE_BGRA
-                    if (bit->bitmap.pixel_mode != FT_PIXEL_MODE_BGRA)
-#endif
-                    {
-                        composite_bitmap(pixmap_,
-                                         &bit->bitmap,
-                                         halo_fill,
-                                         bit->left,
-                                         height - bit->top,
-                                         halo_opacity,
-                                         halo_comp_op_);
-                    }
+                    composite_bitmap(pixmap_,
+                                     &bit->bitmap,
+                                     halo_fill,
+                                     bit->left,
+                                     height - bit->top,
+                                     halo_opacity,
+                                     halo_comp_op_);
                 }
             }
             else
diff --git a/test/data-visual b/test/data-visual
index 2749835d3..a2624810e 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 2749835d3265d95b951c2c90c099fac35e326f39
+Subproject commit a2624810e3f8d187af2ec0995bcfba0ef61d00d9