From 8b04d0db6c55e36935690d37defb6f9b68945796 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:40:36 +0000 Subject: SPDocument->Document (bzr r8404) --- src/sp-pattern.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sp-pattern.cpp') diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 90af65b97..60d2254f7 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -64,7 +64,7 @@ struct SPPatPainter { static void sp_pattern_class_init (SPPatternClass *klass); static void sp_pattern_init (SPPattern *gr); -static void sp_pattern_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); +static void sp_pattern_build (SPObject *object, Document *document, Inkscape::XML::Node *repr); static void sp_pattern_release (SPObject *object); static void sp_pattern_set (SPObject *object, unsigned int key, const gchar *value); static void sp_pattern_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref); @@ -151,7 +151,7 @@ sp_pattern_init (SPPattern *pat) } static void -sp_pattern_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) +sp_pattern_build (SPObject *object, Document *document, Inkscape::XML::Node *repr) { if (((SPObjectClass *) pattern_parent_class)->build) (* ((SPObjectClass *) pattern_parent_class)->build) (object, document, repr); @@ -443,7 +443,7 @@ pattern_users (SPPattern *pattern) SPPattern * pattern_chain (SPPattern *pattern) { - SPDocument *document = SP_OBJECT_DOCUMENT (pattern); + Document *document = SP_OBJECT_DOCUMENT (pattern); Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document)); @@ -496,7 +496,7 @@ sp_pattern_transform_multiply (SPPattern *pattern, Geom::Matrix postmul, bool se } const gchar * -pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix transform, Geom::Matrix move) +pattern_tile (GSList *reprs, Geom::Rect bounds, Document *document, Geom::Matrix transform, Geom::Matrix move) { Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document)); -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/sp-pattern.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sp-pattern.cpp') diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 60d2254f7..90af65b97 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -64,7 +64,7 @@ struct SPPatPainter { static void sp_pattern_class_init (SPPatternClass *klass); static void sp_pattern_init (SPPattern *gr); -static void sp_pattern_build (SPObject *object, Document *document, Inkscape::XML::Node *repr); +static void sp_pattern_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); static void sp_pattern_release (SPObject *object); static void sp_pattern_set (SPObject *object, unsigned int key, const gchar *value); static void sp_pattern_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref); @@ -151,7 +151,7 @@ sp_pattern_init (SPPattern *pat) } static void -sp_pattern_build (SPObject *object, Document *document, Inkscape::XML::Node *repr) +sp_pattern_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { if (((SPObjectClass *) pattern_parent_class)->build) (* ((SPObjectClass *) pattern_parent_class)->build) (object, document, repr); @@ -443,7 +443,7 @@ pattern_users (SPPattern *pattern) SPPattern * pattern_chain (SPPattern *pattern) { - Document *document = SP_OBJECT_DOCUMENT (pattern); + SPDocument *document = SP_OBJECT_DOCUMENT (pattern); Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document)); @@ -496,7 +496,7 @@ sp_pattern_transform_multiply (SPPattern *pattern, Geom::Matrix postmul, bool se } const gchar * -pattern_tile (GSList *reprs, Geom::Rect bounds, Document *document, Geom::Matrix transform, Geom::Matrix move) +pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix transform, Geom::Matrix move) { Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document)); -- cgit v1.2.3 From 3e4d7124a9ff4b05723d938831f149fc313e1fc0 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Mon, 14 Sep 2009 00:58:45 +0000 Subject: add comment (copied from sp-gradient) explaining why this must set a flag, to be cleared in the next update, instead of calling modified method directly (bzr r8585) --- src/sp-pattern.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/sp-pattern.cpp') diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 90af65b97..ec0d0d576 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -432,6 +432,7 @@ pattern_ref_modified (SPObject */*ref*/, guint /*flags*/, SPPattern *pattern) { if (SP_IS_OBJECT (pattern)) SP_OBJECT (pattern)->requestModified(SP_OBJECT_MODIFIED_FLAG); + /* Conditional to avoid causing infinite loop if there's a cycle in the href chain. */ } guint -- cgit v1.2.3