zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-05-27 04:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): clear path parser state #1091

Browse Source
This commit is contained in:
Mikael Sand
2019-09-08 02:12:19 +03:00
parent 7d3803026a
commit 88b0c584a4
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/PathParser.java
+25 -11
View File
@@ -4,7 +4,7 @@ import android.graphics.Path;
import android.graphics.RectF;
class PathParser {
static final PathParser singleton = new PathParser();
private static final PathParser singleton = new PathParser();
private PathParser() {
}
@@ -15,27 +15,34 @@ class PathParser {
static float mScale;
private char prev_cmd = ' ';
private Path mPath;
private int i = 0;
private int l = 0;
private String s;
private int i;
private int l;
private float mPenX = 0f;
private float mPenY = 0f;
private float mPenX;
private float mPenY;
private float mPivotX;
private float mPivotY;
private float mPenDownX;
private float mPenDownY;
private float mPivotX = 0f;
private float mPivotY = 0f;
private boolean mPenDown = false;
private boolean mPenDown;
Path parse(String data) {
private Path parse(String data) {
char prev_cmd = ' ';
mPath = new Path();
l = data.length();
prev_cmd = ' ';
s = data;
i = 0;
mPenX = 0f;
mPenY = 0f;
mPivotX = 0f;
mPivotY = 0f;
mPenDownX = 0f;
mPenDownY = 0f;
mPenDown = false;
while (i < l) {
skip_spaces();
@@ -187,6 +194,7 @@ class PathParser {
}
private void moveTo(float x, float y) {
//FLog.w(ReactConstants.TAG, "move x: " + x + " y: " + y);
mPenDownX = mPivotX = mPenX = x;
mPenDownY = mPivotY = mPenY = y;
mPath.moveTo(x * mScale, y * mScale);
@@ -197,6 +205,7 @@ class PathParser {
}
private void lineTo(float x, float y) {
//FLog.w(ReactConstants.TAG, "line x: " + x + " y: " + y);
setPenDown();
mPivotX = mPenX = x;
mPivotY = mPenY = y;
@@ -208,6 +217,7 @@ class PathParser {
}
private void curveTo(float c1x, float c1y, float c2x, float c2y, float ex, float ey) {
//FLog.w(ReactConstants.TAG, "curve c1x: " + c1x + " c1y: " + c1y + "ex: " + ex + " ey: " + ey);
mPivotX = c2x;
mPivotY = c2y;
cubicTo(c1x, c1y, c2x, c2y, ex, ey);
@@ -225,6 +235,7 @@ class PathParser {
}
private void smoothCurveTo(float c1x, float c1y, float ex, float ey) {
//FLog.w(ReactConstants.TAG, "smoothcurve c1x: " + c1x + " c1y: " + c1y + "ex: " + ex + " ey: " + ey);
float c2x = c1x;
float c2y = c1y;
c1x = (mPenX * 2) - mPivotX;
@@ -239,6 +250,7 @@ class PathParser {
}
private void quadraticBezierCurveTo(float c1x, float c1y, float c2x, float c2y) {
//FLog.w(ReactConstants.TAG, "quad c1x: " + c1x + " c1y: " + c1y + "c2x: " + c2x + " c2y: " + c2y);
mPivotX = c1x;
mPivotY = c1y;
float ex = c2x;
@@ -255,6 +267,7 @@ class PathParser {
}
private void smoothQuadraticBezierCurveTo(float c1x, float c1y) {
//FLog.w(ReactConstants.TAG, "smoothquad c1x: " + c1x + " c1y: " + c1y);
float c2x = c1x;
float c2y = c1y;
c1x = (mPenX * 2) - mPivotX;
@@ -267,6 +280,7 @@ class PathParser {
}
private void arcTo(float rx, float ry, float rotation, boolean outer, boolean clockwise, float x, float y) {
//FLog.w(ReactConstants.TAG, "arc rx: " + rx + " ry: " + ry + " rotation: " + rotation + " outer: " + outer + " clockwise: " + clockwise + " x: " + x + " y: " + y);
float tX = mPenX;
float tY = mPenY;
ios/Utils/RNSVGPathParser.m
+7
View File
@@ -205,6 +205,7 @@
- (void)moveTo:(CGMutablePathRef)path x:(float)x y:(float)y
{
//RCTLogInfo(@"move x: %f y: %f", x, y);
_penDownX = _pivotX = _penX = x;
_penDownY = _pivotY = _penY = y;
CGPathMoveToPoint(path, nil, x, y);
@@ -216,6 +217,7 @@
}
- (void)lineTo:(CGMutablePathRef)path x:(float)x y:(float)y{
//RCTLogInfo(@"line x: %f y: %f", x, y);
[self setPenDown];
_pivotX = _penX = x;
_pivotY = _penY = y;
@@ -234,6 +236,7 @@
- (void)curveTo:(CGMutablePathRef)path c1x:(float)c1x c1y:(float)c1y c2x:(float)c2x c2y:(float)c2y ex:(float)ex ey:(float)ey
{
//RCTLogInfo(@"curve c1x: %f c1y: %f c2x: %f c2y: %f ex: %f ey: %f", c1x, c1y, c2x, c2y, ex, ey);
_pivotX = c2x;
_pivotY = c2y;
[self curveToPoint:path c1x:(float)c1x c1y:(float)c1y c2x:(float)c2x c2y:(float)c2y ex:(float)ex ey:(float)ey];
@@ -254,6 +257,7 @@
- (void)smoothCurveTo:(CGMutablePathRef)path c1x:(float)c1x c1y:(float)c1y ex:(float)ex ey:(float)ey
{
//RCTLogInfo(@"smoothcurve c1x: %f c1y: %f ex: %f ey: %f", c1x, c1y, ex, ey);
float c2x = c1x;
float c2y = c1y;
c1x = (_penX * 2) - _pivotX;
@@ -270,6 +274,7 @@
- (void)quadraticBezierCurveTo:(CGMutablePathRef)path c1x:(float)c1x c1y:(float)c1y c2x:(float)c2x c2y:(float)c2y
{
//RCTLogInfo(@"quad c1x: %f c1y: %f c2x: %f c2y: %f", c1x, c1y, c2x, c2y);
_pivotX = c1x;
_pivotY = c1y;
float ex = c2x;
@@ -288,6 +293,7 @@
- (void)smoothQuadraticBezierCurveTo:(CGMutablePathRef)path c1x:(float)c1x c1y:(float)c1y
{
//RCTLogInfo(@"smoothquad c1x: %f c1y: %f", c1x, c1y);
float c2x = c1x;
float c2y = c1y;
c1x = (_penX * 2) - _pivotX;
@@ -302,6 +308,7 @@
- (void)arcTo:(CGMutablePathRef)path rx:(float)rx ry:(float)ry rotation:(float)rotation outer:(BOOL)outer clockwise:(BOOL)clockwise x:(float)x y:(float)y
{
//RCTLogInfo(@"arc rx: %f ry: %f rotation: %f outer: %i clockwise: %i x: %f y: %f", rx, ry, rotation, outer, clockwise, x, y);
float tX = _penX;
float tY = _penY;