diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-07-19 21:22:12 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-07-19 21:22:12 +0000 |
| commit | db8282d8518263885625d9c19aefad1bdbb175d4 (patch) | |
| tree | 911a397de0ac4588c2475e6bc3d9310ad3e92d2a /src/sp-lpe-item.cpp | |
| parent | update to trunk (r13425) (diff) | |
| parent | Warnings cleaup. (diff) | |
| download | inkscape-db8282d8518263885625d9c19aefad1bdbb175d4.tar.gz inkscape-db8282d8518263885625d9c19aefad1bdbb175d4.zip | |
update to trunk (r13454)
(bzr r13398.1.4)
Diffstat (limited to 'src/sp-lpe-item.cpp')
| -rw-r--r-- | src/sp-lpe-item.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index bfecdcf98..321d2fc42 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -339,16 +339,8 @@ lpeobject_ref_modified(SPObject */*href*/, guint /*flags*/, SPLPEItem *lpeitem) static void sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem) { - SPMask * mask = lpeitem->mask_ref->getObject(); - if(mask) - { - sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(mask->firstChild())); - } - SPClipPath * clipPath = lpeitem->clip_ref->getObject(); - if(clipPath) - { - sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild())); - } + g_return_if_fail(lpeitem != NULL); + if (SP_IS_GROUP(lpeitem)) { GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem)); for ( GSList const *iter = item_list; iter; iter = iter->next ) { @@ -369,16 +361,7 @@ sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem) static void sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem) { - SPMask * mask = lpeitem->mask_ref->getObject(); - if(mask) - { - sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(mask->firstChild())); - } - SPClipPath * clipPath = lpeitem->clip_ref->getObject(); - if(clipPath) - { - sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild())); - } + g_return_if_fail(lpeitem != NULL); if (SP_IS_GROUP(lpeitem)) { GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem)); @@ -625,6 +608,9 @@ bool SPLPEItem::hasPathEffectRecursive() const } } +//The next 3 functions are because the revert of the bug 1241902 +//for the moment not used + void sp_lpe_item_apply_to_clippath(SPItem * item) { |