treeform · treeform · Nov 11, 2021 · Nov 10, 2021
diff --git a/examples/gradient.png b/examples/gradient.png
diff --git a/examples/heart.png b/examples/heart.png
diff --git a/examples/masking.png b/examples/masking.png
diff --git a/examples/shadow.png b/examples/shadow.png
diff --git a/examples/text.png b/examples/text.png
diff --git a/examples/text_spans.png b/examples/text_spans.png
diff --git a/examples/tiger.png b/examples/tiger.png
diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
@@ -1192,26 +1192,28 @@ proc computeCoverages(
 
   # Do scanlines for this row
   let partitionIndex = partitioning.getIndexForY(y)
-  var
-    yLine = y.float32 + initialOffset - offset
-    scanline = line(vec2(0, yLine), vec2(width, yLine))
+  var yLine = y.float32 + initialOffset - offset
   for m in 0 ..< quality:
     yLine += offset
-    scanline.a.y = yLine
-    scanline.b.y = yLine
     numHits = 0
     for i in 0 ..< partitioning.partitions[partitionIndex].len: # Perf
       let
         segment = partitioning.partitions[partitionIndex][i][0]
         winding = partitioning.partitions[partitionIndex][i][1]
-      if segment.at.y <= scanline.a.y and segment.to.y >= scanline.a.y:
-        var at: Vec2
-        if scanline.intersects(segment, at):
-          if segment.to != at:
-            if numHits == hits.len:
-              hits.setLen(hits.len * 2)
-            hits[numHits] = (min(at.x, width), winding)
-            inc numHits
+      if segment.at.y <= yLine and segment.to.y >= yLine:
+        let x =
+          if segment.at.x - segment.to.x == 0:
+            segment.at.x
+          else:
+            let
+              m = (segment.at.y - segment.to.y) / (segment.at.x - segment.to.x)
+              b = segment.at.y - m * segment.at.x
+            (yLine - b) / m
+
+        if numHits == hits.len:
+          hits.setLen(hits.len * 2)
+        hits[numHits] = (min(x, width), winding)
+        inc numHits
 
     sort(hits, 0, numHits - 1)
 

diff --git a/tests/contexts/bezierCurveTo_1.png b/tests/contexts/bezierCurveTo_1.png
diff --git a/tests/contexts/clip_1.png b/tests/contexts/clip_1.png
diff --git a/tests/contexts/clip_1b.png b/tests/contexts/clip_1b.png
diff --git a/tests/contexts/clip_1d.png b/tests/contexts/clip_1d.png
diff --git a/tests/contexts/clip_1f.png b/tests/contexts/clip_1f.png
diff --git a/tests/contexts/clip_3.png b/tests/contexts/clip_3.png
diff --git a/tests/contexts/ellipse_1.png b/tests/contexts/ellipse_1.png
diff --git a/tests/contexts/quadracticCurveTo_1.png b/tests/contexts/quadracticCurveTo_1.png
diff --git a/tests/contexts/quadracticCurveTo_2.png b/tests/contexts/quadracticCurveTo_2.png
diff --git a/tests/contexts/strokeText_1.png b/tests/contexts/strokeText_1.png
diff --git a/tests/fileformats/svg/diffs/Ghostscript_Tiger.png b/tests/fileformats/svg/diffs/Ghostscript_Tiger.png
diff --git a/tests/fileformats/svg/diffs/circle01.png b/tests/fileformats/svg/diffs/circle01.png
diff --git a/tests/fileformats/svg/diffs/ellipse01.png b/tests/fileformats/svg/diffs/ellipse01.png
diff --git a/tests/fileformats/svg/diffs/miterlimit.png b/tests/fileformats/svg/diffs/miterlimit.png
diff --git a/tests/fileformats/svg/diffs/polygon01.png b/tests/fileformats/svg/diffs/polygon01.png
diff --git a/tests/fileformats/svg/diffs/quad01.png b/tests/fileformats/svg/diffs/quad01.png
diff --git a/tests/fileformats/svg/diffs/rect02.png b/tests/fileformats/svg/diffs/rect02.png
diff --git a/tests/fileformats/svg/diffs/scale.png b/tests/fileformats/svg/diffs/scale.png
diff --git a/tests/fileformats/svg/emojitwo.png b/tests/fileformats/svg/emojitwo.png
diff --git a/tests/fileformats/svg/flat-color-icons.png b/tests/fileformats/svg/flat-color-icons.png
diff --git a/tests/fileformats/svg/ionicons.png b/tests/fileformats/svg/ionicons.png
diff --git a/tests/fileformats/svg/noto-emoji.png b/tests/fileformats/svg/noto-emoji.png
diff --git a/tests/fileformats/svg/openmoji.png b/tests/fileformats/svg/openmoji.png
diff --git a/tests/fileformats/svg/rendered/Ghostscript_Tiger.png b/tests/fileformats/svg/rendered/Ghostscript_Tiger.png
diff --git a/tests/fileformats/svg/rendered/circle01.png b/tests/fileformats/svg/rendered/circle01.png
diff --git a/tests/fileformats/svg/rendered/ellipse01.png b/tests/fileformats/svg/rendered/ellipse01.png
diff --git a/tests/fileformats/svg/rendered/miterlimit.png b/tests/fileformats/svg/rendered/miterlimit.png
diff --git a/tests/fileformats/svg/rendered/polygon01.png b/tests/fileformats/svg/rendered/polygon01.png
diff --git a/tests/fileformats/svg/rendered/quad01.png b/tests/fileformats/svg/rendered/quad01.png
diff --git a/tests/fileformats/svg/rendered/rect02.png b/tests/fileformats/svg/rendered/rect02.png
diff --git a/tests/fileformats/svg/rendered/scale.png b/tests/fileformats/svg/rendered/scale.png
diff --git a/tests/fileformats/svg/simple-icons.png b/tests/fileformats/svg/simple-icons.png
diff --git a/tests/fileformats/svg/tabler-icons.png b/tests/fileformats/svg/tabler-icons.png
diff --git a/tests/fileformats/svg/twbs-icons.png b/tests/fileformats/svg/twbs-icons.png
diff --git a/tests/fileformats/svg/twemoji.png b/tests/fileformats/svg/twemoji.png
diff --git a/tests/fonts/diffs/alignments.png b/tests/fonts/diffs/alignments.png
diff --git a/tests/fonts/diffs/basic10.png b/tests/fonts/diffs/basic10.png
diff --git a/tests/fonts/diffs/basic6.png b/tests/fonts/diffs/basic6.png
diff --git a/tests/fonts/diffs/basic8b.png b/tests/fonts/diffs/basic8b.png
diff --git a/tests/fonts/diffs/cff.png b/tests/fonts/diffs/cff.png
diff --git a/tests/fonts/diffs/cff_jp.png b/tests/fonts/diffs/cff_jp.png
diff --git a/tests/fonts/diffs/cff_strikethrough.png b/tests/fonts/diffs/cff_strikethrough.png
diff --git a/tests/fonts/diffs/cff_underline.png b/tests/fonts/diffs/cff_underline.png
diff --git a/tests/fonts/diffs/fallback.png b/tests/fonts/diffs/fallback.png
diff --git a/tests/fonts/diffs/fallback2.png b/tests/fonts/diffs/fallback2.png
diff --git a/tests/fonts/diffs/huge1.png b/tests/fonts/diffs/huge1.png
diff --git a/tests/fonts/diffs/huge1_nokern.png b/tests/fonts/diffs/huge1_nokern.png
diff --git a/tests/fonts/diffs/huge2.png b/tests/fonts/diffs/huge2.png
diff --git a/tests/fonts/diffs/huge2_nokern.png b/tests/fonts/diffs/huge2_nokern.png
diff --git a/tests/fonts/diffs/huge3.png b/tests/fonts/diffs/huge3.png
diff --git a/tests/fonts/diffs/huge3_nokern.png b/tests/fonts/diffs/huge3_nokern.png
diff --git a/tests/fonts/diffs/image_stroke.png b/tests/fonts/diffs/image_stroke.png
diff --git a/tests/fonts/diffs/lines2.png b/tests/fonts/diffs/lines2.png
diff --git a/tests/fonts/diffs/mask_stroke.png b/tests/fonts/diffs/mask_stroke.png
diff --git a/tests/fonts/diffs/pairs1.png b/tests/fonts/diffs/pairs1.png
diff --git a/tests/fonts/diffs/pairs2.png b/tests/fonts/diffs/pairs2.png
diff --git a/tests/fonts/diffs/pairs3.png b/tests/fonts/diffs/pairs3.png
diff --git a/tests/fonts/diffs/paragraph1.png b/tests/fonts/diffs/paragraph1.png
diff --git a/tests/fonts/diffs/paragraph1_2.png b/tests/fonts/diffs/paragraph1_2.png
diff --git a/tests/fonts/diffs/paragraph1_3.png b/tests/fonts/diffs/paragraph1_3.png
diff --git a/tests/fonts/diffs/paragraph1_nokern.png b/tests/fonts/diffs/paragraph1_nokern.png
diff --git a/tests/fonts/diffs/paragraph1_nokern_2.png b/tests/fonts/diffs/paragraph1_nokern_2.png
diff --git a/tests/fonts/diffs/paragraph1_nokern_3.png b/tests/fonts/diffs/paragraph1_nokern_3.png
diff --git a/tests/fonts/diffs/paragraph2.png b/tests/fonts/diffs/paragraph2.png
diff --git a/tests/fonts/diffs/paragraph2_2.png b/tests/fonts/diffs/paragraph2_2.png
diff --git a/tests/fonts/diffs/paragraph2_3.png b/tests/fonts/diffs/paragraph2_3.png
diff --git a/tests/fonts/diffs/paragraph2_nokern.png b/tests/fonts/diffs/paragraph2_nokern.png
diff --git a/tests/fonts/diffs/paragraph2_nokern_2.png b/tests/fonts/diffs/paragraph2_nokern_2.png
diff --git a/tests/fonts/diffs/paragraph2_nokern_3.png b/tests/fonts/diffs/paragraph2_nokern_3.png
diff --git a/tests/fonts/diffs/paragraph3.png b/tests/fonts/diffs/paragraph3.png
diff --git a/tests/fonts/diffs/paragraph3_2.png b/tests/fonts/diffs/paragraph3_2.png
diff --git a/tests/fonts/diffs/paragraph3_3.png b/tests/fonts/diffs/paragraph3_3.png
diff --git a/tests/fonts/diffs/paragraph3_nokern.png b/tests/fonts/diffs/paragraph3_nokern.png
diff --git a/tests/fonts/diffs/paragraph3_nokern_2.png b/tests/fonts/diffs/paragraph3_nokern_2.png
diff --git a/tests/fonts/diffs/paragraph3_nokern_3.png b/tests/fonts/diffs/paragraph3_nokern_3.png
diff --git a/tests/fonts/diffs/paragraph4.png b/tests/fonts/diffs/paragraph4.png
diff --git a/tests/fonts/diffs/paragraph4_2.png b/tests/fonts/diffs/paragraph4_2.png
diff --git a/tests/fonts/diffs/paragraph4_3.png b/tests/fonts/diffs/paragraph4_3.png
diff --git a/tests/fonts/diffs/paragraph4_nokern.png b/tests/fonts/diffs/paragraph4_nokern.png
diff --git a/tests/fonts/diffs/paragraph4_nokern_2.png b/tests/fonts/diffs/paragraph4_nokern_2.png
diff --git a/tests/fonts/diffs/paragraph4_nokern_3.png b/tests/fonts/diffs/paragraph4_nokern_3.png
diff --git a/tests/fonts/diffs/paragraph5.png b/tests/fonts/diffs/paragraph5.png
diff --git a/tests/fonts/diffs/paragraph5_2.png b/tests/fonts/diffs/paragraph5_2.png
diff --git a/tests/fonts/diffs/paragraph5_3.png b/tests/fonts/diffs/paragraph5_3.png
diff --git a/tests/fonts/diffs/paragraph5_nokern.png b/tests/fonts/diffs/paragraph5_nokern.png
diff --git a/tests/fonts/diffs/paragraph5_nokern_2.png b/tests/fonts/diffs/paragraph5_nokern_2.png
diff --git a/tests/fonts/diffs/paragraph5_nokern_3.png b/tests/fonts/diffs/paragraph5_nokern_3.png
diff --git a/tests/fonts/diffs/selection_rects2.png b/tests/fonts/diffs/selection_rects2.png
diff --git a/tests/fonts/diffs/spans1.png b/tests/fonts/diffs/spans1.png
diff --git a/tests/fonts/diffs/spans2.png b/tests/fonts/diffs/spans2.png
diff --git a/tests/fonts/diffs/spans4.png b/tests/fonts/diffs/spans4.png
diff --git a/tests/fonts/diffs/spans5.png b/tests/fonts/diffs/spans5.png
diff --git a/tests/fonts/diffs/spans6.png b/tests/fonts/diffs/spans6.png
diff --git a/tests/fonts/diffs/strikethrough3.png b/tests/fonts/diffs/strikethrough3.png
diff --git a/tests/fonts/diffs/underline3.png b/tests/fonts/diffs/underline3.png
diff --git a/tests/fonts/rendered/alignments.png b/tests/fonts/rendered/alignments.png
diff --git a/tests/fonts/rendered/basic10.png b/tests/fonts/rendered/basic10.png
diff --git a/tests/fonts/rendered/basic6.png b/tests/fonts/rendered/basic6.png
diff --git a/tests/fonts/rendered/basic8b.png b/tests/fonts/rendered/basic8b.png
diff --git a/tests/fonts/rendered/cff.png b/tests/fonts/rendered/cff.png
diff --git a/tests/fonts/rendered/cff_jp.png b/tests/fonts/rendered/cff_jp.png
diff --git a/tests/fonts/rendered/cff_strikethrough.png b/tests/fonts/rendered/cff_strikethrough.png
diff --git a/tests/fonts/rendered/cff_underline.png b/tests/fonts/rendered/cff_underline.png
diff --git a/tests/fonts/rendered/fallback.png b/tests/fonts/rendered/fallback.png
diff --git a/tests/fonts/rendered/fallback2.png b/tests/fonts/rendered/fallback2.png
diff --git a/tests/fonts/rendered/huge1.png b/tests/fonts/rendered/huge1.png
diff --git a/tests/fonts/rendered/huge1_nokern.png b/tests/fonts/rendered/huge1_nokern.png
diff --git a/tests/fonts/rendered/huge2.png b/tests/fonts/rendered/huge2.png
diff --git a/tests/fonts/rendered/huge2_nokern.png b/tests/fonts/rendered/huge2_nokern.png
diff --git a/tests/fonts/rendered/huge3.png b/tests/fonts/rendered/huge3.png
diff --git a/tests/fonts/rendered/huge3_nokern.png b/tests/fonts/rendered/huge3_nokern.png
diff --git a/tests/fonts/rendered/image_stroke.png b/tests/fonts/rendered/image_stroke.png
diff --git a/tests/fonts/rendered/lines2.png b/tests/fonts/rendered/lines2.png
diff --git a/tests/fonts/rendered/mask_stroke.png b/tests/fonts/rendered/mask_stroke.png
diff --git a/tests/fonts/rendered/pairs1.png b/tests/fonts/rendered/pairs1.png
diff --git a/tests/fonts/rendered/pairs2.png b/tests/fonts/rendered/pairs2.png
diff --git a/tests/fonts/rendered/pairs3.png b/tests/fonts/rendered/pairs3.png
diff --git a/tests/fonts/rendered/paragraph1.png b/tests/fonts/rendered/paragraph1.png
diff --git a/tests/fonts/rendered/paragraph1_2.png b/tests/fonts/rendered/paragraph1_2.png
diff --git a/tests/fonts/rendered/paragraph1_3.png b/tests/fonts/rendered/paragraph1_3.png
diff --git a/tests/fonts/rendered/paragraph1_nokern.png b/tests/fonts/rendered/paragraph1_nokern.png
diff --git a/tests/fonts/rendered/paragraph1_nokern_2.png b/tests/fonts/rendered/paragraph1_nokern_2.png
diff --git a/tests/fonts/rendered/paragraph1_nokern_3.png b/tests/fonts/rendered/paragraph1_nokern_3.png
diff --git a/tests/fonts/rendered/paragraph2.png b/tests/fonts/rendered/paragraph2.png
diff --git a/tests/fonts/rendered/paragraph2_2.png b/tests/fonts/rendered/paragraph2_2.png
diff --git a/tests/fonts/rendered/paragraph2_3.png b/tests/fonts/rendered/paragraph2_3.png
diff --git a/tests/fonts/rendered/paragraph2_nokern.png b/tests/fonts/rendered/paragraph2_nokern.png
diff --git a/tests/fonts/rendered/paragraph2_nokern_2.png b/tests/fonts/rendered/paragraph2_nokern_2.png
diff --git a/tests/fonts/rendered/paragraph2_nokern_3.png b/tests/fonts/rendered/paragraph2_nokern_3.png
diff --git a/tests/fonts/rendered/paragraph3.png b/tests/fonts/rendered/paragraph3.png
diff --git a/tests/fonts/rendered/paragraph3_2.png b/tests/fonts/rendered/paragraph3_2.png
diff --git a/tests/fonts/rendered/paragraph3_3.png b/tests/fonts/rendered/paragraph3_3.png
diff --git a/tests/fonts/rendered/paragraph3_nokern.png b/tests/fonts/rendered/paragraph3_nokern.png
diff --git a/tests/fonts/rendered/paragraph3_nokern_2.png b/tests/fonts/rendered/paragraph3_nokern_2.png
diff --git a/tests/fonts/rendered/paragraph3_nokern_3.png b/tests/fonts/rendered/paragraph3_nokern_3.png
diff --git a/tests/fonts/rendered/paragraph4.png b/tests/fonts/rendered/paragraph4.png
diff --git a/tests/fonts/rendered/paragraph4_2.png b/tests/fonts/rendered/paragraph4_2.png
diff --git a/tests/fonts/rendered/paragraph4_3.png b/tests/fonts/rendered/paragraph4_3.png
diff --git a/tests/fonts/rendered/paragraph4_nokern.png b/tests/fonts/rendered/paragraph4_nokern.png
diff --git a/tests/fonts/rendered/paragraph4_nokern_2.png b/tests/fonts/rendered/paragraph4_nokern_2.png
diff --git a/tests/fonts/rendered/paragraph4_nokern_3.png b/tests/fonts/rendered/paragraph4_nokern_3.png
diff --git a/tests/fonts/rendered/paragraph5.png b/tests/fonts/rendered/paragraph5.png
diff --git a/tests/fonts/rendered/paragraph5_2.png b/tests/fonts/rendered/paragraph5_2.png
diff --git a/tests/fonts/rendered/paragraph5_3.png b/tests/fonts/rendered/paragraph5_3.png
diff --git a/tests/fonts/rendered/paragraph5_nokern.png b/tests/fonts/rendered/paragraph5_nokern.png
diff --git a/tests/fonts/rendered/paragraph5_nokern_2.png b/tests/fonts/rendered/paragraph5_nokern_2.png
diff --git a/tests/fonts/rendered/paragraph5_nokern_3.png b/tests/fonts/rendered/paragraph5_nokern_3.png
diff --git a/tests/fonts/rendered/selection_rects1.png b/tests/fonts/rendered/selection_rects1.png
diff --git a/tests/fonts/rendered/selection_rects2.png b/tests/fonts/rendered/selection_rects2.png
diff --git a/tests/fonts/rendered/spans1.png b/tests/fonts/rendered/spans1.png
diff --git a/tests/fonts/rendered/spans2.png b/tests/fonts/rendered/spans2.png
diff --git a/tests/fonts/rendered/spans4.png b/tests/fonts/rendered/spans4.png
diff --git a/tests/fonts/rendered/spans5.png b/tests/fonts/rendered/spans5.png
diff --git a/tests/fonts/rendered/spans6.png b/tests/fonts/rendered/spans6.png
diff --git a/tests/fonts/rendered/strikethrough3.png b/tests/fonts/rendered/strikethrough3.png
diff --git a/tests/fonts/rendered/underline3.png b/tests/fonts/rendered/underline3.png
diff --git a/tests/fonts/svg_ibm.png b/tests/fonts/svg_ibm.png
diff --git a/tests/images/strokeEllipse.png b/tests/images/strokeEllipse.png
diff --git a/tests/images/strokePolygon.png b/tests/images/strokePolygon.png
diff --git a/tests/images/strokeRoundedRect.png b/tests/images/strokeRoundedRect.png
diff --git a/tests/masks/drawEllipse.png b/tests/masks/drawEllipse.png
diff --git a/tests/masks/strokeEllipse.png b/tests/masks/strokeEllipse.png
diff --git a/tests/masks/strokePolygon.png b/tests/masks/strokePolygon.png
diff --git a/tests/masks/strokeRoundedRect.png b/tests/masks/strokeRoundedRect.png
diff --git a/tests/paths/arc.png b/tests/paths/arc.png
diff --git a/tests/paths/arcTo1.png b/tests/paths/arcTo1.png
diff --git a/tests/paths/arcTo2.png b/tests/paths/arcTo2.png
diff --git a/tests/paths/arcTo3.png b/tests/paths/arcTo3.png
diff --git a/tests/paths/opacityStroke.png b/tests/paths/opacityStroke.png
diff --git a/tests/paths/pixelScale.png b/tests/paths/pixelScale.png