[[ Bug 15035 ]] Fix wrong points given by MCGPathIterate

livecodeian · livecodeian · commit 0ebe2b5519fb · 2015-03-20T11:43:58.000Z
diff --git a/docs/notes/bugfix-15035.md b/docs/notes/bugfix-15035.md
@@ -0,0 +1 @@
+# LCB-Canvas: Svg path loses data in roundtrip
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -953,6 +953,8 @@ bool MCGPathIterate(MCGPathRef self, MCGPathIterateCallback p_callback, void *p_
 	SkPath::Verb t_verb;
 	SkPoint t_sk_points[4];
 	
+	// IM-2015-03-20: [[ Bug 15035 ]] The first point returned by SkPath::Iter::next() is
+	//  always the last moveTo point; the points for the current verb start at index 1.
 	while (t_success && (t_verb = t_iter.next(t_sk_points)) != SkPath::kDone_Verb)
 	{
 		switch(t_verb)
@@ -969,22 +971,22 @@ bool MCGPathIterate(MCGPathRef self, MCGPathIterateCallback p_callback, void *p_
 					continue;
 				
 				t_command = kMCGPathCommandLineTo;
-				t_points[0] = MCGPointFromSkPoint(t_sk_points[0]);
+				t_points[0] = MCGPointFromSkPoint(t_sk_points[1]);
 				t_point_count = 1;
 				break;
 				
 			case SkPath::kQuad_Verb:
 				t_command = kMCGPathCommandQuadCurveTo;
-				t_points[0] = MCGPointFromSkPoint(t_sk_points[0]);
-				t_points[1] = MCGPointFromSkPoint(t_sk_points[1]);
+				t_points[0] = MCGPointFromSkPoint(t_sk_points[1]);
+				t_points[1] = MCGPointFromSkPoint(t_sk_points[2]);
 				t_point_count = 2;
 				break;
 				
 			case SkPath::kCubic_Verb:
 				t_command = kMCGPathCommandCubicCurveTo;
-				t_points[0] = MCGPointFromSkPoint(t_sk_points[0]);
-				t_points[1] = MCGPointFromSkPoint(t_sk_points[1]);
-				t_points[2] = MCGPointFromSkPoint(t_sk_points[2]);
+				t_points[0] = MCGPointFromSkPoint(t_sk_points[1]);
+				t_points[1] = MCGPointFromSkPoint(t_sk_points[2]);
+				t_points[2] = MCGPointFromSkPoint(t_sk_points[3]);
 				t_point_count = 3;
 				break;
 				

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# LCB-Canvas: Svg path loses data in roundtrip`