From aaaedcde708655831b2cafccaf63e62decaea78c Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sun, 17 Mar 2013 02:40:59 +0100
Subject: [PATCH] Remove last usage of cairomm. Fixes a85ce71.

---
 include/mapnik/cairo_context.hpp | 1 -
 src/cairo_context.cpp            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/mapnik/cairo_context.hpp b/include/mapnik/cairo_context.hpp
index 2e1d245bf..6fedadb92 100644
--- a/include/mapnik/cairo_context.hpp
+++ b/include/mapnik/cairo_context.hpp
@@ -42,7 +42,6 @@
 // cairo
 #include <cairo.h>
 #include <cairo-ft.h>
-#include <cairomm/cairomm.h>
 // stl
 #include <valarray>
 // agg
diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp
index 0389f1b07..6189a2043 100644
--- a/src/cairo_context.cpp
+++ b/src/cairo_context.cpp
@@ -416,7 +416,7 @@ void cairo_context::add_text(glyph_positions_ptr pos,
         double text_size = glyph.format->text_size * scale_factor;
         glyph.face->set_character_sizes(text_size);
 
-        Cairo::Matrix matrix;
+        cairo_matrix_t matrix;
         matrix.xx = text_size * itr->rot.cos;
         matrix.xy = text_size * itr->rot.sin;
         matrix.yx = text_size * -itr->rot.sin;