From 6a3d63aa40f17e6dcc8cd5cfbdbeed3d510a23a1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 11 Jun 2015 11:44:27 -0700
Subject: [PATCH] consistent initialization in scriptrun and placement_finder

---
 include/mapnik/text/placement_finder.hpp |  4 ++--
 include/mapnik/text/scrptrun.hpp         | 10 +++++-----
 src/text/placement_finder.cpp            |  6 +++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
index 9a6c439e4..89a4da70f 100644
--- a/include/mapnik/text/placement_finder.hpp
+++ b/include/mapnik/text/placement_finder.hpp
@@ -99,8 +99,8 @@ private:
     box2d<double> marker_box_;
     bool marker_unlocked_;
     pixel_position marker_displacement_;
-    double move_dx_ = 0.0;
-    horizontal_alignment_e horizontal_alignment_ = H_LEFT;
+    double move_dx_;
+    horizontal_alignment_e horizontal_alignment_;
 };
 
 }//ns mapnik
diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp
index c8acec63b..e4c607f6c 100644
--- a/include/mapnik/text/scrptrun.hpp
+++ b/include/mapnik/text/scrptrun.hpp
@@ -23,15 +23,15 @@
 
 struct ScriptRecord
 {
-    UChar32 startChar;
-    UChar32 endChar;
-    UScriptCode scriptCode;
+    UChar32 startChar = 0;
+    UChar32 endChar = 0;
+    UScriptCode scriptCode = USCRIPT_INVALID_CODE;
 };
 
 struct ParenStackEntry
 {
-    int32_t pairIndex;
-    UScriptCode scriptCode;
+    int32_t pairIndex = 0;
+    UScriptCode scriptCode = USCRIPT_INVALID_CODE;
 };
 
 class ScriptRun : public UObject {
diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp
index ff44147d2..a9ebef0eb 100644
--- a/src/text/placement_finder.cpp
+++ b/src/text/placement_finder.cpp
@@ -59,7 +59,11 @@ placement_finder::placement_finder(feature_impl const& feature,
       placements_(),
       has_marker_(false),
       marker_(),
-      marker_box_() {}
+      marker_box_(),
+      marker_unlocked_(false),
+      marker_displacement_(),
+      move_dx_(0.0),
+      horizontal_alignment_(H_LEFT) {}
 
 bool placement_finder::next_position()
 {