From 995ab49f23b1815b05cfb5b16ebe1f915451c275 Mon Sep 17 00:00:00 2001
From: talaj <jiri.drbalek@gmail.com>
Date: Fri, 6 Oct 2017 09:27:58 +0200
Subject: [PATCH] fix memory leak (#3775)

---
 include/mapnik/geom_util.hpp |  1 +
 src/text/renderer.cpp        | 17 ++++++++++-------
 test/data-visual             |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 9311139e5..d16c42eee 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -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>
diff --git a/src/text/renderer.cpp b/src/text/renderer.cpp
index 163d11c6f..a549d6c9d 100644
--- a/src/text/renderer.cpp
+++ b/src/text/renderer.cpp
@@ -178,13 +178,16 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
                 if (!error)
                 {
                     FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(g);
-                    composite_bitmap(pixmap_,
-                                     &bit->bitmap,
-                                     halo_fill,
-                                     bit->left,
-                                     height - bit->top,
-                                     halo_opacity,
-                                     halo_comp_op_);
+                    if (bit->bitmap.pixel_mode != FT_PIXEL_MODE_BGRA)
+                    {
+                        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 a2624810e..2749835d3 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit a2624810e3f8d187af2ec0995bcfba0ef61d00d9
+Subproject commit 2749835d3265d95b951c2c90c099fac35e326f39