From 34d96df3233e0be5492ce7f221deb8ca06beae9a Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Thu, 23 Dec 2021 13:17:22 -0600
Subject: [PATCH] 3.1.2 bugfix

---
 pixie.nimble                       |   2 +-
 src/pixie/paths.nim                |  14 +++++++++++--
 tests/paths/path0pxCover.png       | Bin 0 -> 313 bytes
 tests/paths/path1pxCover.png       | Bin 0 -> 315 bytes
 tests/paths/pathStroke1Big.png     | Bin 0 -> 1414 bytes
 tests/paths/pathStroke1BigMask.png | Bin 0 -> 432 bytes
 tests/test_paths.nim               |  31 +++++++++++++++++++++++++++++
 7 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 tests/paths/path0pxCover.png
 create mode 100644 tests/paths/path1pxCover.png
 create mode 100644 tests/paths/pathStroke1Big.png
 create mode 100644 tests/paths/pathStroke1BigMask.png

diff --git a/pixie.nimble b/pixie.nimble
index 85a8301..0da9a12 100644
--- a/pixie.nimble
+++ b/pixie.nimble
@@ -1,4 +1,4 @@
-version     = "3.1.1"
+version     = "3.1.2"
 author      = "Andre von Houck and Ryan Oldenburg"
 description = "Full-featured 2d graphics library for Nim."
 license     = "MIT"
diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index 1e37fbe..34b745b 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -1601,11 +1601,16 @@ proc fillShapes(
     bounds = computeBounds(segments).snapToPixels()
     startX = max(0, bounds.x.int)
     startY = max(0, bounds.y.int)
+    pathWidth =
+      if startX < image.width:
+        min(bounds.w.int, image.width - startX)
+      else:
+        0
     pathHeight = min(image.height, (bounds.y + bounds.h).int)
     partitioning = partitionSegments(segments, startY, pathHeight - startY)
 
   var
-    coverages = newSeq[uint8](bounds.w.int)
+    coverages = newSeq[uint8](pathWidth)
     hits = newSeq[(float32, int16)](partitioning.maxEntryCount)
     numHits: int
     aa: bool
@@ -1659,11 +1664,16 @@ proc fillShapes(
     bounds = computeBounds(segments).snapToPixels()
     startX = max(0, bounds.x.int)
     startY = max(0, bounds.y.int)
+    pathWidth =
+      if startX < mask.width:
+        min(bounds.w.int, mask.width - startX)
+      else:
+        0
     pathHeight = min(mask.height, (bounds.y + bounds.h).int)
     partitioning = partitionSegments(segments, startY, pathHeight)
 
   var
-    coverages = newSeq[uint8](bounds.w.int)
+    coverages = newSeq[uint8](pathWidth)
     hits = newSeq[(float32, int16)](partitioning.maxEntryCount)
     numHits: int
     aa: bool
diff --git a/tests/paths/path0pxCover.png b/tests/paths/path0pxCover.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95358daba82623edcbd30e72ddb8a8ddf5756c1
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSU}W%gaSW+oe0$N5m%)JNzy`0U
z=PP-t{48^rEH^oKDH^sNkq}Du=ow0k<v;WGi(5((<?PQ4p{k6!)u;6HfI-6G>FVdQ
I&MBb@0K}+bZ2$lO

literal 0
HcmV?d00001

diff --git a/tests/paths/path1pxCover.png b/tests/paths/path1pxCover.png
new file mode 100644
index 0000000000000000000000000000000000000000..49a575c86ea361952402436baec21d36b33228ca
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSU}W-iaSW+oe0y;tFM|Tlfel`N
z>WhCi2&Qh3KQY00iG)zHM~|Xm+mWHf_+)Z_?t9mHJe`Ir$0kTPC*fmo-kiBNN`YBh
TJ6F#e7$^*$u6{1-oD!M<nulfm

literal 0
HcmV?d00001

diff --git a/tests/paths/pathStroke1Big.png b/tests/paths/pathStroke1Big.png
new file mode 100644
index 0000000000000000000000000000000000000000..a77d43e3db22fbddfb9824ac6722d57c964428da
GIT binary patch
literal 1414
zcmY+EX-pGQ5XXxmN4aAGF%hhC*t$RjLj;6iIiwa!tu4f$R<sng6|aP7P?0O7qNZ}F
z6$k`rxt5BQ8%lzJvK*4A0l}&fafw=E0tO`*;@fZ25BoO%*|-1So5`C|3it;d=v(PD
z8qI+lA0tF>DfQS`q4nZ?xrj#Fl*o-aAi8Stb6U>N7cgQ!%fl>+zL?&og@#QoroMl!
z-8A+EFYqeL4)K;36%5JcPm@|As(L+B`*JdWYFzb~1j9XDA39b9nh9P8vq4B|x|~I<
zWf#{xcDm<0N1#cVs-f2LK?#G1K5<&2yQzG+7{%`KcDmMoBXpJ7Q(KXLT1fcJR-TgZ
zBPSUj`rS7Gxwsl&Sy#eq3mqA#y#AQQU#@pn9SR^w#@gkjv)X-R1C)Qq2@Yjlal|xE
z)T`%<^o6%Xm$@PJ?;e&W1&>%)K^gla5IE0<8ziIdh_p0guteU(`bVXmMdLz=g8wYg
zuUfV;Rs*dgg1P}%cHx-FCf?_v^vZ3N(q6q^06g@pU5YD6$&}j+jXPiMf~QKAwL?xz
z&^hMz@?#~Ftd*||ZzkM43=k_%5JIev?{1h8z0?h06}be&PQSt+Rxay=*p47M#BNoa
zVb2@u;3*P~IF$azb|@W;{ZM|xYM~@BEtHK|6O>9!2jy9;4N5N72_*~bh0+!q0Fs=>
zA(woBLoS(&LoVrtn{hLfkAgA>`!)N6GOLTl@WM_Eeurh&$~MC?A8Av=GB>^x!7?)x
zW>`gt8P>M~Vm*ozA@<H739-6#cZi*7t$<kGtQcZ_OlH_!eHcj3<9Q}D7G@m>r6_G(
zgT9eXswC6}3sb2s=(awIauSaQQd-iLje6))pE25X$qDuL>ZikgXhXPrb_0h`^=tLM
z$YRtudR~NxnL%CmDZFxcpz<G4=-H%lq%7`r>_jc?wQWUE_?!CU557K#HdN=M4g9(A
zsTRZj&a9l7xuLbY&Zv9S>bAWeF+@{S=299OD}<Q2k@B@3wkj7E+DpF+n^bm>+RE4q
z94%Wz@5y5wYUJpoCKPtrqAz1hy<ecP$NfDh97oQfux+;%g?9w_Yv^hf4~2bYXISD<
kdwUiNDBIDuxDw$<+AlmWOktbih~_Je8_SQ;aZcv_2W0V~ZvX%Q

literal 0
HcmV?d00001

diff --git a/tests/paths/pathStroke1BigMask.png b/tests/paths/pathStroke1BigMask.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4b62d40cdbb290cb57b274abaa3c8d6bebfe934
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq003kF003kN00000Rf)=o0004ZNkl<ZcmciA
ziw%P?41{4zS%7gEkF}VtRiU&26334_{sH{S(v{b;HLb#{Ec@-5sT>GZ`5{c@j}Vm#
z;VCsjQ_3{&^V%Y9tgH_xMIKO!JfIYLK=~l_Up9oT><C%;B3$J_sLBsvDu0BiR0vP0
z5t?#BSjrh8DHnvJToH<LLm0{(At((5ue1=j(nQco8v!dF1grEAsM1A{N*@6#3W8HK
z1g5A6O3@LJGC(lO2!SX=1fh%(fMP)MiUmn4CM2uakfdTna*7p6DP|<2*pY<dK;nuA
z2`erns`!wg;zVMK7YQkDB%=6{fD%CbN(6B$A;hc15T_DEd`c8?DPhE;#1V&*K<r8e
zF)Jy=s^k!(l0<Au7BMMl#G>R8g91Rt3IZ7_5M-oakbwe1bOnW|3JlQ{9HJ;dq^}^6
zt^!4R3Kr=oV5F^}k){GiS_&R%C<NrLFp!%<L9Pl1xhN#$tgw)iLPKhWhg1p?k#(9y
aL`2>ZaKUsA!CJHc0000<MNUMnLSTYIfuwK%

literal 0
HcmV?d00001

diff --git a/tests/test_paths.nim b/tests/test_paths.nim
index 8c81a5a..e6ee881 100644
--- a/tests/test_paths.nim
+++ b/tests/test_paths.nim
@@ -634,3 +634,34 @@ block:
   image.strokePath(path, paint, strokeWidth = 10)
 
   image.writeFile("tests/paths/opacityStroke.png")
+
+block:
+  let
+    image = newImage(100, 100)
+    pathStr = "M0 0 L200 200"
+    color = rgba(255, 0, 0, 255)
+  image.strokePath(pathStr, color, strokeWidth = 10)
+  image.writeFile("tests/paths/pathStroke1Big.png")
+
+block:
+  let
+    image = newMask(100, 100)
+    pathStr = "M0 0 L200 200"
+  image.strokePath(pathStr, strokeWidth = 10)
+  image.writeFile("tests/paths/pathStroke1BigMask.png")
+
+block:
+  let
+    image = newImage(100, 100)
+    pathStr = "M99 99 L999 99 L999 100 L99 100 Z"
+    color = rgba(255, 0, 0, 255)
+  image.fillPath(pathStr, color)
+  image.writeFile("tests/paths/path1pxCover.png")
+
+block:
+  let
+    image = newImage(100, 100)
+    pathStr = "M100 100 L999 100 L999 101 L100 101 Z"
+    color = rgba(255, 0, 0, 255)
+  image.fillPath(pathStr, color)
+  image.writeFile("tests/paths/path0pxCover.png")