From 9affd59b008500e6704c20458186899fd4fc5b70 Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Wed, 24 Oct 2018 00:03:02 +0300 Subject: [PATCH] Fix path parser spec conformance https://www.w3.org/TR/SVG/paths.html#PathDataMovetoCommands The "moveto" commands (M or m) must establish a new initial point and a new current point. --- android/src/main/java/com/horcrux/svg/PropHelper.java | 4 ++-- ios/Utils/RNSVGPathParser.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/PropHelper.java b/android/src/main/java/com/horcrux/svg/PropHelper.java index fcfc1fb7..66c739aa 100644 --- a/android/src/main/java/com/horcrux/svg/PropHelper.java +++ b/android/src/main/java/com/horcrux/svg/PropHelper.java @@ -399,8 +399,8 @@ class PropHelper { } private void moveTo(float x, float y) { - mPivotX = mPenX = x; - mPivotY = mPenY = y; + mPenDownX = mPivotX = mPenX = x; + mPenDownY = mPivotY = mPenY = y; mPath.moveTo(x * mScale, y * mScale); mLastStartPoint = getPointMap(x ,y); diff --git a/ios/Utils/RNSVGPathParser.m b/ios/Utils/RNSVGPathParser.m index 34a222c7..8fea698b 100644 --- a/ios/Utils/RNSVGPathParser.m +++ b/ios/Utils/RNSVGPathParser.m @@ -144,8 +144,8 @@ - (void)moveTo:(CGMutablePathRef)path x:(float)x y:(float)y { - _pivotX = _penX = x; - _pivotY = _penY = y; + _penDownX = _pivotX = _penX = x; + _penDownY = _pivotY = _penY = y; CGPathMoveToPoint(path, nil, x, y); }