From 46c8852eed1180b68dcd7a2686bf8d9a9f443ed3 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 20 Nov 2017 20:40:51 +0100
Subject: [PATCH] text: fix for certain versions of HarfBuzz

---
 panda/src/text/textAssembler.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/panda/src/text/textAssembler.cxx b/panda/src/text/textAssembler.cxx
index 745488e7c1..a10179db04 100644
--- a/panda/src/text/textAssembler.cxx
+++ b/panda/src/text/textAssembler.cxx
@@ -1411,9 +1411,8 @@ assemble_row(TextAssembler::TextRow &row,
 
   bool underscore = false;
   PN_stdfloat underscore_start = 0.0f;
-  const TextProperties *underscore_properties = NULL;
-
-  const ComputedProperties *prev_cprops;
+  const TextProperties *underscore_properties = nullptr;
+  const ComputedProperties *prev_cprops = nullptr;
 
 #ifdef HAVE_HARFBUZZ
   hb_buffer_t *harfbuff = nullptr;
@@ -1697,6 +1696,7 @@ shape_buffer(hb_buffer_t *buf, PlacedGlyphs &placed_glyphs, PN_stdfloat &xpos,
       break;
     }
   }
+  hb_buffer_set_content_type(buf, HB_BUFFER_CONTENT_TYPE_UNICODE);
   hb_buffer_set_direction(buf, direction);
   hb_buffer_guess_segment_properties(buf);