summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-10-05 12:19:04 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-10-05 12:19:04 +0000
commit67d61b662f9c7f8cd39ea78335efb709bade4549 (patch)
tree1df7203973194293cb2e338fed03094b746fd502 /src/live_effects
parentMatch default for star tool and star toolbar (diff)
downloadinkscape-67d61b662f9c7f8cd39ea78335efb709bade4549.tar.gz
inkscape-67d61b662f9c7f8cd39ea78335efb709bade4549.zip
Fix various minor code problems
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp4
-rw-r--r--src/live_effects/lpe-offset.cpp2
-rw-r--r--src/live_effects/lpe-powerclip.cpp2
-rw-r--r--src/live_effects/lpe-powerstroke-interpolators.h2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 57b793993..7a21c2a2c 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -120,7 +120,6 @@ LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
}
items.clear();
container = dynamic_cast<SPObject *>(sp_lpe_item->parent);
- Inkscape::XML::Node *root = getSPDoc()->getReprRoot();
if (previous_num_copies != num_copies) {
gint numcopies_gap = previous_num_copies - num_copies;
if (numcopies_gap > 0 && num_copies != 0) {
@@ -209,7 +208,6 @@ LPECopyRotate::cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bo
if (!document) {
return;
}
- Inkscape::XML::Document *xml_doc = document->getReprDoc();
if ( SP_IS_GROUP(orig) && SP_IS_GROUP(dest) && SP_GROUP(orig)->getItemCount() == SP_GROUP(dest)->getItemCount() ) {
if (reset) {
cloneStyle(orig, dest);
@@ -578,7 +576,7 @@ LPECopyRotate::doEffect_path_post (Geom::PathVector const & path_in)
if (method != RM_NORMAL) {
Geom::PathVector join_pv = original_pathv * t;
join_pv *= Geom::Translate(half_dir * rot * gap);
- Geom::PathIntersectionGraph *pig = new Geom::PathIntersectionGraph(output_pv, join_pv);
+ std::unique_ptr<Geom::PathIntersectionGraph> pig(new Geom::PathIntersectionGraph(output_pv, join_pv));
if (pig) {
if (!output_pv.empty()) {
output_pv = pig->getUnion();
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 72d29d0c1..bcaf15062 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -352,7 +352,7 @@ LPEOffset::doEffect_path(Geom::PathVector const & path_in)
if (offset > 0 &&
((original_width < against_dir_width &&
original_width < with_dir_width) ||
- (original_height < against_dir_width &&
+ (original_height < against_dir_height &&
original_height < with_dir_height)))
{
diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp
index cb444149c..7e3f8edb7 100644
--- a/src/live_effects/lpe-powerclip.cpp
+++ b/src/live_effects/lpe-powerclip.cpp
@@ -111,6 +111,7 @@ LPEPowerClip::doBeforeEffect (SPLPEItem const* lpeitem){
if(!strcmp(is_inverse_str,"false") && inverse && isVisible()) {
SPCurve * clipcurve = new SPCurve();
addInverse(SP_ITEM(clip_data), clipcurve, Geom::Affine::identity(), true);
+ clipcurve->unref();
} else if((!strcmp(is_inverse_str,"true") && !inverse && isVisible()) ||
(inverse && !is_visible && is_inverse_str == (Glib::ustring)"true"))
{
@@ -335,7 +336,6 @@ LPEPowerClip::doOnVisibilityToggled(SPLPEItem const* lpeitem)
void
LPEPowerClip::flattenClip(SPItem * clip_data, Geom::PathVector &path_in)
{
- SPClipPath *clip_path = SP_ITEM(sp_lpe_item)->clip_ref->getObject();
if (SP_IS_GROUP(clip_data)) {
std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(clip_data));
for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
diff --git a/src/live_effects/lpe-powerstroke-interpolators.h b/src/live_effects/lpe-powerstroke-interpolators.h
index 65bee9a63..940d97e4f 100644
--- a/src/live_effects/lpe-powerstroke-interpolators.h
+++ b/src/live_effects/lpe-powerstroke-interpolators.h
@@ -199,7 +199,7 @@ public:
Spiro::spiro_run(controlpoints, len, fit);
fit *= Scale(1,scale_y);
- delete controlpoints;
+ g_free(controlpoints);
return fit;
};