From 53933f5fea9d07d1ba6304b88439fba257ee8c34 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 2 Feb 2011 22:24:36 +0100
Subject: update to latest 2geom !

(bzr r10025)
---
 src/sp-root.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-root.cpp')

diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index 5f868539b..61b5fda5b 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -438,7 +438,7 @@ sp_root_update(SPObject *object, SPCtx *ctx, guint flags)
          * fixme: height seems natural, as this makes the inner svg element
          * fixme: self-contained. The spec is vague here.
          */
-        root->c2p = Geom::Matrix(Geom::Translate(root->x.computed,
+        root->c2p = Geom::Affine(Geom::Translate(root->x.computed,
                                                  root->y.computed));
     }
 
-- 
cgit v1.2.3


From 60119035d8b8cf1f32cce97a4a4b9b181ba91cf8 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 20 Feb 2011 02:37:24 -0800
Subject: Pass removing some outdated C-macro use.

(bzr r10059)
---
 src/sp-root.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-root.cpp')

diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index 61b5fda5b..5b0bf4cde 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -567,7 +567,7 @@ sp_root_modified(SPObject *object, guint flags)
 
     /* fixme: (Lauris) */
     if (!object->parent && (flags & SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
-        SP_OBJECT_DOCUMENT(root)->emitResizedSignal(root->width.computed, root->height.computed);
+        root->document->emitResizedSignal(root->width.computed, root->height.computed);
     }
 }
 
-- 
cgit v1.2.3


From 0e0ce7571944e0a9d60294b6efdc855e6df52db8 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Tue, 22 Feb 2011 01:17:44 -0800
Subject: Finished cleanup of outdated SP_OBJECT_REPR C macro.

(bzr r10067)
---
 src/sp-root.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-root.cpp')

diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index 5b0bf4cde..8286bfc4f 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -376,7 +376,7 @@ static void sp_root_remove_child(SPObject *object, Inkscape::XML::Node *child)
 {
     SPRoot *root = (SPRoot *) object;
 
-    if ( root->defs && SP_OBJECT_REPR(root->defs) == child ) {
+    if ( root->defs && (root->defs->getRepr() == child) ) {
         SPObject *iter = 0;
         // We search for first remaining <defs> node - it is not beautiful, but works
         for ( iter = object->firstChild() ; iter ; iter = iter->getNext() ) {
-- 
cgit v1.2.3