[[ libgraphics ]] Handle Skia path close verb when iterating.

livecodeian · livecodeian · commit 42e6cba5a66b · 2015-02-17T14:47:41.000Z
[[ Canvas ]] Fix some svg path data parsing issues - relative moveto command not relative. close command not setting the current point for relative commands.
diff --git a/engine/src/module-canvas.cpp b/engine/src/module-canvas.cpp
@@ -2965,6 +2965,7 @@ void MCCanvasPathMakeEmpty(MCCanvasPathRef &r_path)
 struct MCCanvasPathSVGParseContext
 {
 	MCGPathRef path;
+	MCGPoint first_point;
 	MCGPoint last_point;
 	MCGPoint last_control;
 	MCSVGPathCommand last_command;
@@ -2982,14 +2983,17 @@ bool MCCanvasPathSVGParseCallback(void *p_context, MCSVGPathCommand p_command, f
 		{
 			MCGPoint t_point;
 			t_point = MCGPointMake(p_params[0], p_params[1]);
+			if (p_command == kMCSVGPathRelativeMoveTo)
+				t_point = MCGPointRelativeToAbsolute(t_context->last_point, t_point);
 			MCGPathMoveTo(t_context->path, t_point);
-			t_context->last_point = t_point;
+			t_context->last_point = t_context->first_point = t_point;
 			break;
 		}
 			
 		case kMCSVGPathClose:
 		case kMCSVGPathRelativeClose:
 			MCGPathCloseSubpath(t_context->path);
+			t_context->last_point = t_context->first_point;
 			break;
 			
 		case kMCSVGPathLineTo:
@@ -3131,8 +3135,8 @@ bool MCCanvasPathSVGParseCallback(void *p_context, MCSVGPathCommand p_command, f
 		}
 			
 		default:
-			MCAssert(false);
-			
+			MCUnreachable();
+			break;
 	}
 	
 	t_context->last_command = p_command;
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -694,17 +694,13 @@ bool MCGPathIterate(MCGPathRef self, MCGPathIterateCallback p_callback, void *p_
 				break;
 				
 			case SkPath::kLine_Verb:
+				// Don't call callback for implicit lineto from close command
 				if (t_iter.isCloseLine())
-				{
-					t_command = kMCGPathCommandCloseSubpath;
-					t_point_count = 0;
-				}
-				else
-				{
-					t_command = kMCGPathCommandLineTo;
-					t_points[0] = MCGPointFromSkPoint(t_sk_points[0]);
-					t_point_count = 1;
-				}
+					continue;
+				
+				t_command = kMCGPathCommandLineTo;
+				t_points[0] = MCGPointFromSkPoint(t_sk_points[0]);
+				t_point_count = 1;
 				break;
 				
 			case SkPath::kQuad_Verb:
@@ -722,6 +718,11 @@ bool MCGPathIterate(MCGPathRef self, MCGPathIterateCallback p_callback, void *p_
 				t_point_count = 3;
 				break;
 				
+			case SkPath::kClose_Verb:
+				t_command = kMCGPathCommandCloseSubpath;
+				t_point_count = 0;
+				break;
+				
 			default:
 				// Unknown path instruction
 				t_success = false;
