From 9cdb9a7bf383ce4f953c5b21b6fb7016c4db5d69 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sun, 29 Jul 2012 01:31:10 +0200
Subject: [PATCH] Fix build errors introduced by
 4e3e5cb0b05524800060bef8d805e0c36d401d6b.

---
 bindings/python/mapnik_shield_symbolizer.cpp | 4 ++--
 include/mapnik/map.hpp                       | 1 +
 src/save_map.cpp                             | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bindings/python/mapnik_shield_symbolizer.cpp b/bindings/python/mapnik_shield_symbolizer.cpp
index 653469f2b..10f5957cb 100644
--- a/bindings/python/mapnik_shield_symbolizer.cpp
+++ b/bindings/python/mapnik_shield_symbolizer.cpp
@@ -60,8 +60,8 @@ tuple get_shield_displacement(const shield_symbolizer& s)
 
 void set_shield_displacement(shield_symbolizer & s, boost::python::tuple arg)
 {
-    s.get_placement_options()->defaults.displacement.first = extract<double>(arg[0]);
-    s.get_placement_options()->defaults.displacement.second = extract<double>(arg[1]);
+    s.get_placement_options()->defaults.displacement.x = extract<double>(arg[0]);
+    s.get_placement_options()->defaults.displacement.y = extract<double>(arg[1]);
 }
 
 tuple get_text_displacement(const shield_symbolizer& t)
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index acbe6f6a7..e79934e8a 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -30,6 +30,7 @@
 #include <mapnik/layer.hpp>
 #include <mapnik/metawriter/properties.hpp>
 #include <mapnik/params.hpp>
+#include <mapnik/ctrans.hpp>
 
 // boost
 #include <boost/optional/optional.hpp>
diff --git a/src/save_map.cpp b/src/save_map.cpp
index dbe06c293..7ba99a75d 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -204,10 +204,10 @@ public:
             set_attr(sym_node, "unlock-image", sym.get_unlock_image());
         }
 
-        if (sym.get_placement_options()->defaults.format.text_opacity !=
-                dfl.get_placement_options()->defaults.format.text_opacity || explicit_defaults_)
+        if (sym.get_placement_options()->defaults.format->text_opacity !=
+                dfl.get_placement_options()->defaults.format->text_opacity || explicit_defaults_)
         {
-            set_attr(sym_node, "text-opacity", sym.get_placement_options()->defaults.format.text_opacity);
+            set_attr(sym_node, "text-opacity", sym.get_placement_options()->defaults.format->text_opacity);
         }
         pixel_position displacement = sym.get_shield_displacement();
         if (displacement.x != dfl.get_shield_displacement().x || explicit_defaults_)