From 4effe38236ca3ab6288c4f7fe9bc02b9c069df4d Mon Sep 17 00:00:00 2001
From: treeform <starplant@gmail.com>
Date: Mon, 1 Aug 2022 20:26:36 -0700
Subject: [PATCH] opaqueBounds

---
 src/pixie/images.nim          |  30 ++++++++++++++----------------
 tests/images/cropHeart.png    | Bin 1067 -> 0 bytes
 tests/images/opaqueBounds.png | Bin 0 -> 1131 bytes
 tests/test_images.nim         |  23 +++++++----------------
 4 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 tests/images/cropHeart.png
 create mode 100644 tests/images/opaqueBounds.png

diff --git a/src/pixie/images.nim b/src/pixie/images.nim
index 3af36ca..e4f447f 100644
--- a/src/pixie/images.nim
+++ b/src/pixie/images.nim
@@ -751,15 +751,18 @@ proc superImage*(image: Image, x, y, w, h: int): Image {.raises: [PixieError].}
     result = newImage(w, h)
     result.draw(image, translate(vec2(-x.float32, -y.float32)), OverwriteBlend)
 
-proc cropAlpha*(image: Image): (Image, Rect) =
-  ## Crops the alpha off the edges of an image.
-  ## Returns the new cropped image and the rectangle it used for cropping.
+proc opaqueBounds*(image: Image): Rect =
+  ## Returns the bounds of opaque pixels.
+  ## Some images have transparency around them, use this to find just the
+  ## visible part of the image and then use subImage to cut it out.
+  ## Returns zero rect if whole image is transparent.
+  ## Returns just the size of the image if no edge is transparent.
   var
     xMin = image.width
     xMax = 0
     yMin = image.height
     yMax = 0
-  # Find the crop coordinates.
+  # Find the trim coordinates.
   for y in 0 ..< image.height:
     for x in 0 ..< image.width:
       if image.unsafe[x, y].a != 0:
@@ -768,18 +771,13 @@ proc cropAlpha*(image: Image): (Image, Rect) =
         yMin = min(yMin, y)
         yMax = max(yMax, y + 1)
   if xMax <= xMin or yMax <= yMin:
-    raise newException(PixieError, "Cannot cropAlpha fully transparent image")
-  let
-    corpImage = newImage(xMax - xMin, yMax - yMin)
-    cropRect = rect(
-      xMin.float32,
-      yMin.float32,
-      corpImage.width.float32,
-      corpImage.height.float32
-    )
-  # Draw the bigger image into the cropped image.
-  corpImage.draw(image, translate(vec2(-xMin.float32, -yMin.float32)))
-  return (corpImage, cropRect)
+    return rect(0, 0, 0, 0)
+  rect(
+    xMin.float32,
+    yMin.float32,
+    (xMax - xMin).float32,
+    (yMax - yMin).float32
+  )
 
 when defined(release):
   {.pop.}
diff --git a/tests/images/cropHeart.png b/tests/images/cropHeart.png
deleted file mode 100644
index ea21adbf3405d194da0cdcaddccb450bbfb43241..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B>Nkl<ZcmdU!
z&ubKC9LAsTJF_eOWiLW3_TE3h_RvFcvzNAlB85t?9z@Vk$feNi!7XlnNuh`>Mh_Cu
zo8UpjwrY|^C?Vj*Lv2ZE3@KF0>LHf6y4lQEp4pwHo9yn)?9Oa<KQQop-+8~!_jxj#
z&4x8-!Hd+_@0U`U;f?g@t&O3~{c<{^yjXLulo~z7Gc6=q!ro5x8wSvHW?wm-xs)`C
zN5<g1Kt2<}e$NeS?inLL@C?tg$Gh(b&$5TTo$7B3P#*f`;HKga0LKB?erBp?j&G{|
z&R%Y`f@h-CuM5D(3CK+d-fm^0AtLXvw=|SF+3-FPi+(LYIh{FV49-DBIIJy1#0bt)
zYimFE;?Q>ktPhU92jD7DS$7CEuU0i(s&y>-9EM#9`4+%#cUm;;u4=ke>sa*7i;pw=
zpg87EiW0>!{^aA<H};!)1QO`oCL97gk;Lb5>l;yg63$t0sLd;QM>wc$4CI4wZNZ^7
zuizcwpte!yK)ANxP@7lqj&M-h021V{ZJWruaIbg}h|RarLOk+ap}?0=-v&@<fiI!H
z4FE{N2z0e84?7lg)i}UnEZW^+(QG<SzB{v`$8wy!c_Tl$0)SUvA;5~{Cs+73O8W6B
zxSlHkRIV{aKVhn#-2m1B`)2^leH36B70;CblFd4*I^8b;M0J{;>DPS%#5Q_afFkQ2
z=cO@v+4EQnAhQ$CRP~B?qj%96diDI(0uW1+rvW@?-HQnD+;Woq|Gh?C0Lf>ch-$8O
zx7Se3(c}MZ)de7CPx71sORRed0hZ`(tEX)N<XX05tBh<txYHPw5qjI|V_N_s^SN6B
z%&_hS=!Kpdd1)Ac6zo^S0{q5$C!q&=Y38A6fW5cBTQ}ky1+d<%xeK@+=%v}LrU8h|
zPCRs=P1DB>XVXKgIV}T_<lOiSR4=mbDykRV**^FNAeJVF0lmSxJLrwdOn(9ekbJgm
z6^ma2xaTj~G50u&GlM7v3P5Dx`=VvahZT6hbsSKeGdL@#e&7H^?oO@QPU2Gm{^B}H
zsOf6oomvZ{8!7<dXAxs#Na21F7zxy(Cbh!~h7LgF_SoOHlNeOReXcu!8q}g@J34Iz
zAd=5MwM!dm0CQZo$s9GP)n<SD0f_v1_CIUaz(GK+a~%%3&R%MS>#L{jC*UDJef26g
zm-_;$7rZ@RRDWa-dwtLP&~X5g1sr>R{G=#O@cV4;HKD{a_WbxTdzzdHMI-?{togA^
zmY9@4{_*xaxW{`u<LyO3qydP`o>?#n=R<`qa7|dhv`QcG9@kM4c>p56j6Yub_s<ld
l)BN3F{nnkc+n!1kyauiDp~4^K2jTz#002ovPDHLkV1jXF1Q-AS

diff --git a/tests/images/opaqueBounds.png b/tests/images/opaqueBounds.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bc151d6290d9db3ca68c7fb32d146c5f4b24fc4
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CsNkl<ZcmdU!
z%ZnUU6vn@EtGa`a#EmdY+~*Ha7cPR`?II?ign;697C}e`AsfNzfGu_=4+IH`ILRUm
zm|Y-?5JruenI<4ZAR8AN88HqKd@#C5WHOU})Cu41s*cl-s(w^;x_?k`?yY;i^L<k@
z#WZaY!h_6*FO@U-sY-5ozLL$~s^;>_i#7Mknd!qk6Cx1`djtJi?y<gK&)42KdRQ}s
zQ2n+6G?(95&E?OhP3kvea7G||MeuUqhBfz$k+VF*v+N1(N5Qk~VQ-+Xc&zW&dsX#p
z%~V45TLM(GAML9teg<$5fE#7TKXb6AdYir62!m(((g$u=vqxL>w*=th1mr3N&xV<3
zi^z8Nmb3XoZSMnv=>yv#dbQT1-w066<=-*}ry(L7))yjT1ZSw#+|Rv%^#Rc)eH%b`
zPrnG@B2Zrs2sJOR*EKDE9jm_Y*$zW3C7%G;VW-8zj%{^Ki(kj8?|X*f8v($iofIdE
zN&e&?yq4d|I!<YyNj?Qr5#8^<N#aG|rqVdzKCSy%$184eD`^}sMrDs(CV(jR@Jc}1
zLhnX^U3QfK2C|D+0@4<GHwsMHRRSn<f>#347JBC^FNxnzA9)V;N(KR323Si*ekiON
zg^q0idN+WKZ2)@bTj=gk9(FR^H6HY4GTOsHZ<?Ctm4-1Y2^`NWnWsu8RsrxDD+E}T
z(uq~RM#(rn1?#yUK;;rsj1$K9Yy&v2yWaq~Ge!aKpzgUIKnev<RcFT~fT+&WGyU2p
zKwP621lV9b;%pkD7Xpus0J3oWUse4oxG}=a(QDwZ5r8<F{usc0)}x33_Z=_A&+iSk
z1dvkUFHtQv?v5I&MSA?dtt|nFc|Ltwffd%Hga9k_*6gVzfLtn+U6muv2cI-X<p{ks
z`)CP3WT`kWz#QvQfL`dSotL%&$eR0bN`N0(KS}6;UOIW`7~q9#pRF75-UYDUsd)%k
z5A@P$R>uHD7LNbqK|7{T8qTJNusNXtNP2N*4yxx^4;9sOc6J1j0f?jNDL}8V9u9h?
zJ~NuG0!XP)bv8EM18^f+a$s(77H4*&)Kvf?%b#yJruw!5KX9D{)aDG%>Q=w&07R~z
zyytqUHwE~W>o}pN)xLi6UN5>m1t9!i#JI>R>=%KtKrL!gyH~-U0}#1(?045o?N-Gt
zt_Oh{)S_lTI(-EoQY!r8mMb{`i(L1~A~mShXMg_zh<tzQKWE#-K0q#W-5YY5z0~Nf
zZ!3L2fdKjXgNMb%;yY0NGT4hm^$Yf}H}Y%*0|y`lz;l;o4vFG@exJ>~4wQMuU7DF<
zPlq!-5lesoXX)5^M@&W_e*}90+~Yl-3HIV3)&N8nK3z5`?-hkEb4^%pI^|b+kLx&z
xJphq!XZ~FI`<D!$v;5m&{mgf#TAoTAJOXgjr@|(cdISIf002ovPDHLkV1lZr1C0Ox

literal 0
HcmV?d00001

diff --git a/tests/test_images.nim b/tests/test_images.nim
index bbdb751..5117df1 100644
--- a/tests/test_images.nim
+++ b/tests/test_images.nim
@@ -233,23 +233,15 @@ block:
   doAssert image[10, 10] == rgba(255, 255, 255, 255)
 
 block:
-  # Make sure cropAlpha rases error.
+  # opaqueBounds of fully transparent image.
   let image = newImage(100, 100)
-  var hadError = false
-  try:
-    discard image.cropAlpha()
-  except PixieError:
-    hadError = true
-  doAssert hadError
+  doAssert image.opaqueBounds() == rect(0, 0, 0, 0)
 
 block:
-  # Make sure cropAlpha does nothing to full images.
+  # opaqueBounds of fully opaque image.
   let image = newImage(100, 100)
   image.fill(rgbx(255, 255, 255, 255))
-  let (crop, rect) = image.cropAlpha()
-  doAssert crop.width == image.width
-  doAssert crop.height == image.height
-  doAssert rect == rect(0.0, 0.0, 100.0, 100.0)
+  doAssert image.opaqueBounds() == rect(0.0, 0.0, 100.0, 100.0)
 
 block:
   let image = newImage(100, 100)
@@ -265,8 +257,7 @@ block:
     parseHtmlColor("#FC427B").rgba,
     scale(vec2(0.3, 0.3))
   )
-  let (crop, rect) = image.cropAlpha()
-  doAssert crop.width == 48
-  doAssert crop.height == 48
+  let rect = image.opaqueBounds()
   doAssert rect == rect(6.0, 6.0, 48.0, 48.0)
-  crop.xray("tests/images/cropHeart.png")
+  let trimmedImage = image.subImage(rect.x.int, rect.y.int, rect.w.int, rect.h.int)
+  trimmedImage.xray("tests/images/opaqueBounds.png")