diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-09-21 12:38:51 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-09-21 12:38:51 +0000 |
| commit | 7d0556417f74f08de207b515537fbd268256f817 (patch) | |
| tree | 3bf0b902d3c7c053113f3caaa229dc671375d22d /src | |
| parent | Merge branch 'fix_bug_#1791694' of gitlab.com:Xortex/inkscape (diff) | |
| download | inkscape-7d0556417f74f08de207b515537fbd268256f817.tar.gz inkscape-7d0556417f74f08de207b515537fbd268256f817.zip | |
minor correction to MR
Diffstat (limited to 'src')
| -rwxr-xr-x | src/object/sp-lpe-item.cpp | 3 | ||||
| -rwxr-xr-x | src/selection-chemistry.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp index 819bc7a58..6e98d9209 100755 --- a/src/object/sp-lpe-item.cpp +++ b/src/object/sp-lpe-item.cpp @@ -946,8 +946,7 @@ SPLPEItem::applyToClipPathOrMask(SPItem *clip_mask, SPItem* to, Inkscape::LivePa if (sp_version_inside_range(root->version.inkscape, 0, 1, 0, 92)) { shape->setAttribute("inkscape:original-d", nullptr); } else { - SPCurve * c = nullptr; - c = shape->getCurve(); + SPCurve * c = shape->getCurve(); if (c) { bool success = false; try { diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 402fab372..30a1e8e19 100755 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -3951,8 +3951,8 @@ void ObjectSet::setClipGroup() sort(items_.begin(),items_.end(),sp_object_compare_position_bool); - //convert any rects to paths - for (std::vector<SPItem*>::const_iterator i = items_.begin(); i != items_.end(); ++i) { + // convert any rects to paths + for (std::vector<SPItem *>::const_iterator i = items_.begin(); i != items_.end(); ++i) { clear(); if (dynamic_cast<SPRect *>(*i)) { add(*i); |