diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-06-22 22:31:35 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-06-22 22:31:35 +0000 |
| commit | 4ea46d5ce46eaaecce37c97a308762e0895adb61 (patch) | |
| tree | 6e2ecbc99cd979327329747a076b50271c446d00 | |
| parent | Add new named color 'rebeccapurple' (CSS4 Color). (diff) | |
| download | inkscape-4ea46d5ce46eaaecce37c97a308762e0895adb61.tar.gz inkscape-4ea46d5ce46eaaecce37c97a308762e0895adb61.zip | |
Fix for ungrouping/non-LPEItem masks
Fixed bugs:
- https://launchpad.net/bugs/1333020
(bzr r13341.1.66)
| -rw-r--r-- | src/sp-lpe-item.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 15206d446..87c9ad6fd 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -337,15 +337,22 @@ lpeobject_ref_modified(SPObject */*href*/, guint /*flags*/, SPLPEItem *lpeitem) static void sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem) { + g_return_if_fail(lpeitem != NULL); SPMask * mask = lpeitem->mask_ref->getObject(); - if(mask) + + if (mask) { - sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(mask->firstChild())); + if (SPLPEItem* maskChild = dynamic_cast<SPLPEItem*>(mask->firstChild())) { + sp_lpe_item_create_original_path_recursive(maskChild); + } } + SPClipPath * clipPath = lpeitem->clip_ref->getObject(); - if(clipPath) + if (clipPath) { - sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild())); + if (SPLPEItem* clipChild = dynamic_cast<SPLPEItem*>(clipPath->firstChild())) { + sp_lpe_item_create_original_path_recursive(clipChild); + } } if (SP_IS_GROUP(lpeitem)) { GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem)); @@ -367,15 +374,22 @@ sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem) static void sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem) { + g_return_if_fail(lpeitem != NULL); SPMask * mask = lpeitem->mask_ref->getObject(); - if(mask) + + if (mask) { - sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(mask->firstChild())); + if (SPLPEItem* maskChild = dynamic_cast<SPLPEItem*>(mask->firstChild())) { + sp_lpe_item_cleanup_original_path_recursive(maskChild); + } } + SPClipPath * clipPath = lpeitem->clip_ref->getObject(); - if(clipPath) + if (clipPath) { - sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild())); + if (SPLPEItem* clipChild = dynamic_cast<SPLPEItem*>(clipPath->firstChild())) { + sp_lpe_item_cleanup_original_path_recursive(clipChild); + } } if (SP_IS_GROUP(lpeitem)) { |