summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-02-16 20:29:19 +0000
committerJabiertxof <jtx@jtx>2017-02-16 20:29:19 +0000
commita710b1017f72e57de6f48e2597f8a624a2beed46 (patch)
treeae3ff5111ad1632563a3f246e17101ebd9616dc8 /src
parent[Bug #1426613] moving a selection of frame and text-flowed-into-frame displac... (diff)
downloadinkscape-a710b1017f72e57de6f48e2597f8a624a2beed46.tar.gz
inkscape-a710b1017f72e57de6f48e2597f8a624a2beed46.zip
Fix crashes when element is not shape in rotate copies and mirror symmetry. remove std::cout uneeded
(bzr r15523)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp5
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 42e055062..329005878 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -168,9 +168,6 @@ LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
processObjects(LPE_ERASE);
items.clear();
}
-
- std::cout << previous_num_copies << "previous_num_copies\n";
- std::cout << num_copies << "num_copies\n";
}
void
@@ -190,7 +187,7 @@ LPECopyRotate::cloneD(SPObject *origin, SPObject *dest, bool root, bool reset)
}
SPShape * shape = SP_SHAPE(origin);
SPPath * path = SP_PATH(dest);
- if (!path && !SP_IS_GROUP(dest)) {
+ if (!path && !SP_IS_GROUP(dest) && shape) {
Inkscape::XML::Node *dest_node = sp_selected_item_to_curved_repr(SP_ITEM(dest), 0);
dest->updateRepr(xml_doc, dest_node, SP_OBJECT_WRITE_ALL);
path = SP_PATH(dest);
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 7f0a93c52..c4101fe79 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -196,7 +196,7 @@ LPEMirrorSymmetry::cloneD(SPObject *origin, SPObject *dest, bool live, bool root
}
SPShape * shape = SP_SHAPE(origin);
SPPath * path = SP_PATH(dest);
- if (!path && !SP_IS_GROUP(dest)) {
+ if (!path && !SP_IS_GROUP(dest) && shape) {
Inkscape::XML::Node *dest_node = sp_selected_item_to_curved_repr(SP_ITEM(dest), 0);
dest->updateRepr(xml_doc, dest_node, SP_OBJECT_WRITE_ALL);
path = SP_PATH(dest);