diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/sp-object-repr.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/sp-object-repr.cpp')
| -rw-r--r-- | src/sp-object-repr.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index 475a57521..b40017e65 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -55,10 +55,9 @@ #include "sp-style-elem.h" #include "sp-switch.h" -#include "color-profile-fns.h" +#include "color-profile.h" #include "xml/repr.h" #include "sp-filter.h" -#include "sp-gaussian-blur.h" #include "filters/blend.h" #include "filters/colormatrix.h" #include "filters/componenttransfer.h" @@ -69,6 +68,7 @@ #include "filters/distantlight.h" #include "filters/displacementmap.h" #include "filters/flood.h" +#include "filters/gaussian-blur.h" #include "filters/image.h" #include "filters/merge.h" #include "filters/morphology.h" @@ -89,11 +89,7 @@ static unsigned const N_NAME_TYPES = SODIPODI_TYPE + 1; static GType name_to_gtype(NameType name_type, gchar const *name); -/** - * Construct an SPRoot and all its descendents from the given repr. - */ -SPObject * -sp_object_repr_build_tree(SPDocument *document, Inkscape::XML::Node *repr) +SPRoot *sp_object_repr_build_tree(SPDocument *document, Inkscape::XML::Node *repr) { g_assert(document != NULL); g_assert(repr != NULL); @@ -108,7 +104,7 @@ sp_object_repr_build_tree(SPDocument *document, Inkscape::XML::Node *repr) g_assert(object != NULL); object->invoke_build(document, repr, FALSE); - return object; + return SP_ROOT(object); } GType |