diff --git a/examples/tiger.png b/examples/tiger.png index 5521f5f..a241b71 100644 Binary files a/examples/tiger.png and b/examples/tiger.png differ diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim index c39b1d9..59e618c 100644 --- a/src/pixie/paths.nim +++ b/src/pixie/paths.nim @@ -1171,9 +1171,9 @@ iterator walk( width: float32 ): (float32, float32, int) = var + i, count: int prevAt: float32 - count: int - for i in 0 ..< numHits: + while i < numHits: let (at, winding) = hits[i] if windingRule == wrNonZero and count != 0 and @@ -1182,12 +1182,23 @@ iterator walk( # Shortcut: if nonzero rule, we only care about when the count changes # between zero and nonzero (or the last hit) count += winding + inc i continue if at > 0: if shouldFill(windingRule, count): + # Look ahead to see if the next hit is in the same spot as this hit. + # If it is, see if this and the next hit's windings cancel out. + # If they do, skip the hits and do not yield yet. It will be yielded + # later in a larger chunk. + if i < numHits - 1: + let (nextAt, nextWinding) = hits[i + 1] + if nextAt == at and winding + nextWinding == 0: + i += 2 + continue yield (prevAt, at, count) prevAt = at count += winding + inc i when defined(pixieLeakCheck): if prevAt != width and count != 0: diff --git a/tests/contexts/bezierCurveTo_1.png b/tests/contexts/bezierCurveTo_1.png index a007d41..83bb3bf 100644 Binary files a/tests/contexts/bezierCurveTo_1.png and b/tests/contexts/bezierCurveTo_1.png differ diff --git a/tests/contexts/bezierCurveTo_2.png b/tests/contexts/bezierCurveTo_2.png index 3bfda4a..ef9ed76 100644 Binary files a/tests/contexts/bezierCurveTo_2.png and b/tests/contexts/bezierCurveTo_2.png differ diff --git a/tests/contexts/closePath_1.png b/tests/contexts/closePath_1.png index bd5fc25..8869e5f 100644 Binary files a/tests/contexts/closePath_1.png and b/tests/contexts/closePath_1.png differ diff --git a/tests/contexts/ellipse_1.png b/tests/contexts/ellipse_1.png index f28603e..786a7d5 100644 Binary files a/tests/contexts/ellipse_1.png and b/tests/contexts/ellipse_1.png differ diff --git a/tests/contexts/quadracticCurveTo_1.png b/tests/contexts/quadracticCurveTo_1.png index de9463d..6f6b63f 100644 Binary files a/tests/contexts/quadracticCurveTo_1.png and b/tests/contexts/quadracticCurveTo_1.png differ diff --git a/tests/contexts/strokeText_1.png b/tests/contexts/strokeText_1.png index 0f22eb8..3b028b6 100644 Binary files a/tests/contexts/strokeText_1.png and b/tests/contexts/strokeText_1.png differ diff --git a/tests/fileformats/svg/diffs/Ghostscript_Tiger.png b/tests/fileformats/svg/diffs/Ghostscript_Tiger.png index 3742296..b870b2f 100644 Binary files a/tests/fileformats/svg/diffs/Ghostscript_Tiger.png and b/tests/fileformats/svg/diffs/Ghostscript_Tiger.png differ diff --git a/tests/fileformats/svg/diffs/circle01.png b/tests/fileformats/svg/diffs/circle01.png index 31eb2ed..f8606a0 100644 Binary files a/tests/fileformats/svg/diffs/circle01.png and b/tests/fileformats/svg/diffs/circle01.png differ diff --git a/tests/fileformats/svg/diffs/ellipse01.png b/tests/fileformats/svg/diffs/ellipse01.png index 0de4684..b446986 100644 Binary files a/tests/fileformats/svg/diffs/ellipse01.png and b/tests/fileformats/svg/diffs/ellipse01.png differ diff --git a/tests/fileformats/svg/diffs/miterlimit.png b/tests/fileformats/svg/diffs/miterlimit.png index b8299c7..7803a67 100644 Binary files a/tests/fileformats/svg/diffs/miterlimit.png and b/tests/fileformats/svg/diffs/miterlimit.png differ diff --git a/tests/fileformats/svg/diffs/polygon01.png b/tests/fileformats/svg/diffs/polygon01.png index 09dec93..e66307f 100644 Binary files a/tests/fileformats/svg/diffs/polygon01.png and b/tests/fileformats/svg/diffs/polygon01.png differ diff --git a/tests/fileformats/svg/diffs/quad01.png b/tests/fileformats/svg/diffs/quad01.png index f0e4ac6..3edde6c 100644 Binary files a/tests/fileformats/svg/diffs/quad01.png and b/tests/fileformats/svg/diffs/quad01.png differ diff --git a/tests/fileformats/svg/diffs/rect02.png b/tests/fileformats/svg/diffs/rect02.png index c4afed4..d3cf8c8 100644 Binary files a/tests/fileformats/svg/diffs/rect02.png and b/tests/fileformats/svg/diffs/rect02.png differ diff --git a/tests/fileformats/svg/emojitwo.png b/tests/fileformats/svg/emojitwo.png index e9dc17c..35a3fab 100644 Binary files a/tests/fileformats/svg/emojitwo.png and b/tests/fileformats/svg/emojitwo.png differ diff --git a/tests/fileformats/svg/flat-color-icons.png b/tests/fileformats/svg/flat-color-icons.png index a993866..8de3840 100644 Binary files a/tests/fileformats/svg/flat-color-icons.png and b/tests/fileformats/svg/flat-color-icons.png differ diff --git a/tests/fileformats/svg/ionicons.png b/tests/fileformats/svg/ionicons.png index 6312731..1d2aab4 100644 Binary files a/tests/fileformats/svg/ionicons.png and b/tests/fileformats/svg/ionicons.png differ diff --git a/tests/fileformats/svg/noto-emoji.png b/tests/fileformats/svg/noto-emoji.png index 5567d57..dad7899 100644 Binary files a/tests/fileformats/svg/noto-emoji.png and b/tests/fileformats/svg/noto-emoji.png differ diff --git a/tests/fileformats/svg/openmoji.png b/tests/fileformats/svg/openmoji.png index f21ebcf..70e32e7 100644 Binary files a/tests/fileformats/svg/openmoji.png and b/tests/fileformats/svg/openmoji.png differ diff --git a/tests/fileformats/svg/rendered/Ghostscript_Tiger.png b/tests/fileformats/svg/rendered/Ghostscript_Tiger.png index 805beb3..710a1b9 100644 Binary files a/tests/fileformats/svg/rendered/Ghostscript_Tiger.png and b/tests/fileformats/svg/rendered/Ghostscript_Tiger.png differ diff --git a/tests/fileformats/svg/rendered/circle01.png b/tests/fileformats/svg/rendered/circle01.png index ec30745..56799c1 100644 Binary files a/tests/fileformats/svg/rendered/circle01.png and b/tests/fileformats/svg/rendered/circle01.png differ diff --git a/tests/fileformats/svg/rendered/ellipse01.png b/tests/fileformats/svg/rendered/ellipse01.png index f4df489..9bf42b7 100644 Binary files a/tests/fileformats/svg/rendered/ellipse01.png and b/tests/fileformats/svg/rendered/ellipse01.png differ diff --git a/tests/fileformats/svg/rendered/miterlimit.png b/tests/fileformats/svg/rendered/miterlimit.png index 7a38b52..c2babb8 100644 Binary files a/tests/fileformats/svg/rendered/miterlimit.png and b/tests/fileformats/svg/rendered/miterlimit.png differ diff --git a/tests/fileformats/svg/rendered/polygon01.png b/tests/fileformats/svg/rendered/polygon01.png index aee52b8..ec6a32f 100644 Binary files a/tests/fileformats/svg/rendered/polygon01.png and b/tests/fileformats/svg/rendered/polygon01.png differ diff --git a/tests/fileformats/svg/rendered/quad01.png b/tests/fileformats/svg/rendered/quad01.png index 48166f7..4b3e6c5 100644 Binary files a/tests/fileformats/svg/rendered/quad01.png and b/tests/fileformats/svg/rendered/quad01.png differ diff --git a/tests/fileformats/svg/rendered/rect02.png b/tests/fileformats/svg/rendered/rect02.png index bb77d88..2c00983 100644 Binary files a/tests/fileformats/svg/rendered/rect02.png and b/tests/fileformats/svg/rendered/rect02.png differ diff --git a/tests/fileformats/svg/simple-icons.png b/tests/fileformats/svg/simple-icons.png index 0769a88..9d6217c 100644 Binary files a/tests/fileformats/svg/simple-icons.png and b/tests/fileformats/svg/simple-icons.png differ diff --git a/tests/fileformats/svg/tabler-icons.png b/tests/fileformats/svg/tabler-icons.png index 91ecfca..b629c1c 100644 Binary files a/tests/fileformats/svg/tabler-icons.png and b/tests/fileformats/svg/tabler-icons.png differ diff --git a/tests/fileformats/svg/twbs-icons.png b/tests/fileformats/svg/twbs-icons.png index 53ef9d8..ac850f3 100644 Binary files a/tests/fileformats/svg/twbs-icons.png and b/tests/fileformats/svg/twbs-icons.png differ diff --git a/tests/fileformats/svg/twemoji.png b/tests/fileformats/svg/twemoji.png index f77ab2d..9e11f33 100644 Binary files a/tests/fileformats/svg/twemoji.png and b/tests/fileformats/svg/twemoji.png differ diff --git a/tests/fonts/diffs/image_stroke.png b/tests/fonts/diffs/image_stroke.png index 089c82d..69f41a8 100644 Binary files a/tests/fonts/diffs/image_stroke.png and b/tests/fonts/diffs/image_stroke.png differ diff --git a/tests/fonts/diffs/mask_stroke.png b/tests/fonts/diffs/mask_stroke.png index fa09664..22dbf26 100644 Binary files a/tests/fonts/diffs/mask_stroke.png and b/tests/fonts/diffs/mask_stroke.png differ diff --git a/tests/fonts/diffs/strikethrough3.png b/tests/fonts/diffs/strikethrough3.png index 59db90a..95fb128 100644 Binary files a/tests/fonts/diffs/strikethrough3.png and b/tests/fonts/diffs/strikethrough3.png differ diff --git a/tests/fonts/diffs/underline3.png b/tests/fonts/diffs/underline3.png index f8bfa52..43467ab 100644 Binary files a/tests/fonts/diffs/underline3.png and b/tests/fonts/diffs/underline3.png differ diff --git a/tests/fonts/rendered/image_stroke.png b/tests/fonts/rendered/image_stroke.png index 63f588d..da57d70 100644 Binary files a/tests/fonts/rendered/image_stroke.png and b/tests/fonts/rendered/image_stroke.png differ diff --git a/tests/fonts/rendered/mask_stroke.png b/tests/fonts/rendered/mask_stroke.png index cbefc50..7301630 100644 Binary files a/tests/fonts/rendered/mask_stroke.png and b/tests/fonts/rendered/mask_stroke.png differ diff --git a/tests/fonts/rendered/strikethrough3.png b/tests/fonts/rendered/strikethrough3.png index f8e8dd0..699ffc5 100644 Binary files a/tests/fonts/rendered/strikethrough3.png and b/tests/fonts/rendered/strikethrough3.png differ diff --git a/tests/fonts/rendered/underline3.png b/tests/fonts/rendered/underline3.png index 948a5d4..2c7f62a 100644 Binary files a/tests/fonts/rendered/underline3.png and b/tests/fonts/rendered/underline3.png differ diff --git a/tests/images/strokeEllipse.png b/tests/images/strokeEllipse.png index 5b8e68d..3ef7e07 100644 Binary files a/tests/images/strokeEllipse.png and b/tests/images/strokeEllipse.png differ diff --git a/tests/images/strokePolygon.png b/tests/images/strokePolygon.png index 899fe33..62b1816 100644 Binary files a/tests/images/strokePolygon.png and b/tests/images/strokePolygon.png differ diff --git a/tests/images/strokeRoundedRect.png b/tests/images/strokeRoundedRect.png index 75d2404..22dae20 100644 Binary files a/tests/images/strokeRoundedRect.png and b/tests/images/strokeRoundedRect.png differ diff --git a/tests/masks/strokeEllipse.png b/tests/masks/strokeEllipse.png index c02ca91..76c08c7 100644 Binary files a/tests/masks/strokeEllipse.png and b/tests/masks/strokeEllipse.png differ diff --git a/tests/masks/strokePolygon.png b/tests/masks/strokePolygon.png index 8f82ce8..3c8f6e1 100644 Binary files a/tests/masks/strokePolygon.png and b/tests/masks/strokePolygon.png differ diff --git a/tests/masks/strokeRoundedRect.png b/tests/masks/strokeRoundedRect.png index 8991178..ee37251 100644 Binary files a/tests/masks/strokeRoundedRect.png and b/tests/masks/strokeRoundedRect.png differ diff --git a/tests/paths/arc.png b/tests/paths/arc.png index acda868..8ac91b3 100644 Binary files a/tests/paths/arc.png and b/tests/paths/arc.png differ diff --git a/tests/paths/arcTo3.png b/tests/paths/arcTo3.png index 9db12d4..8bb1cd2 100644 Binary files a/tests/paths/arcTo3.png and b/tests/paths/arcTo3.png differ diff --git a/tests/paths/opacityStroke.png b/tests/paths/opacityStroke.png index 8046321..57f2b5d 100644 Binary files a/tests/paths/opacityStroke.png and b/tests/paths/opacityStroke.png differ diff --git a/tests/paths/pathStroke3.png b/tests/paths/pathStroke3.png index 01c0f55..428b9fa 100644 Binary files a/tests/paths/pathStroke3.png and b/tests/paths/pathStroke3.png differ diff --git a/tests/paths/pixelScale.png b/tests/paths/pixelScale.png index 266554c..eb4bf09 100644 Binary files a/tests/paths/pixelScale.png and b/tests/paths/pixelScale.png differ