summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-03 21:35:23 +0000
committerjabiertxof <info@marker.es>2016-10-03 21:35:23 +0000
commit67fa2b7c2a26e909b1adb5fb188285367dfba7e4 (patch)
tree83fc014c6907d8273f77646225d7cbe8854be85f /src/live_effects
parentUpdate to trunk (diff)
downloadinkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.tar.gz
inkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.zip
Fix merge bugs
(bzr r15017.1.36)
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-measure-line.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 04085015c..6e77931b0 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -161,6 +161,11 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
LPEMeasureLine::~LPEMeasureLine() {}
+void swap(Geom::Point &A, Geom::Point &B){
+ Geom::Point tmp = A;
+ A = B;
+ B = tmp;
+}
void
LPEMeasureLine::doOnApply(SPLPEItem const* lpeitem)
{