From a9016bc7deeacce3ff8d44d2d09ec512dc662445 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sat, 19 Jan 2013 22:54:44 -0800
Subject: Fix multiple instances of ci_key.

(bzr r12045)
---
 src/display/cairo-utils.cpp | 11 +++++++++++
 src/display/cairo-utils.h   |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 692e31837..9655fc194 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -27,6 +27,17 @@
 #include "style.h"
 #include "helper/geom-curves.h"
 
+namespace {
+
+/**
+ * Key for cairo_surface_t to keep track of current color interpolation value
+ * Only the address of the structure is used, it is never initialized. See:
+ * http://www.cairographics.org/manual/cairo-Types.html#cairo-user-data-key-t
+ */
+cairo_user_data_key_t ci_key;
+
+} // namespace
+
 namespace Inkscape {
 
 CairoGroup::CairoGroup(cairo_t *_ct) : ct(_ct), pushed(false) {}
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index e88c6d4e8..af4727c01 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -82,15 +82,6 @@ public:
 
 } // namespace Inkscape
 
-/**
- * Key for cairo_surface_t to keep track of current color interpolation value
- * Only the address of the structure is used, it is never initialized. See:
- * http://www.cairographics.org/manual/cairo-Types.html#cairo-user-data-key-t
- */
-// TODO fixme check this usage. A static here in a header file is probably not doing what was intended:
-static cairo_user_data_key_t ci_key;
-
-
 SPColorInterpolation get_cairo_surface_ci(cairo_surface_t *surface);
 void set_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation cif);
 void copy_cairo_surface_ci(cairo_surface_t *in, cairo_surface_t *out);
-- 
cgit v1.2.3