From edd9e2e28788bd7639b9ce825e1fef8645d71574 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 8 May 2021 00:01:07 +0200
Subject: [PATCH] Fixes necessary for using newest Stb/libopenui version

---
 radio/src/tests/lcd_480x272.cpp     |  16 ++++++++++++++++
 radio/src/tests/mask_menu_radio.png | Bin 0 -> 1194 bytes
 radio/src/thirdparty/libopenui      |   2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 radio/src/tests/mask_menu_radio.png

diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp
index 6373c045a..acb37f454 100644
--- a/radio/src/tests/lcd_480x272.cpp
+++ b/radio/src/tests/lcd_480x272.cpp
@@ -252,4 +252,20 @@ TEST(Lcd_colorlcd, bitmap)
   dc.clearClippingRect();
   EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "bitmap"));
 }
+
+TEST(Lcd_colorlcd, masks)
+{
+  BitmapBuffer dc(BMP_RGB565, LCD_W, LCD_H);
+  dc.clear(DEFAULT_BGCOLOR);
+
+  BitmapBuffer* mask = BitmapBuffer::loadMask(TESTS_PATH "/mask_menu_radio.png");
+  for (int i=0; i<LCD_W; i += mask->width()) {
+    for (int j=0; j<LCD_H; j += mask->height()) {
+      dc.drawMask(i, j, mask, BLACK);
+    }
+  }
+
+  EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "masks"));
+}
+
 #endif
diff --git a/radio/src/tests/mask_menu_radio.png b/radio/src/tests/mask_menu_radio.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d93fbcccd4f6691ea4281d71e62e75e03364563
GIT binary patch
literal 1194
zcmV;b1XcTqP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-wFx`4J3wBaE1T?1UE@U
zK~zY`&6ht&D_ao8Kf{`=g#@BpVN*z~G|eI!Js>F*h4cm#8w;_}LTyA;Y*rAgB%r~@
z#v%b_31|~7v{1pI5-r?9j24nVVi01A%^GoDaml_LvPrxb?(+?tX7`-$w=?I=nb{g5
zB7D&v9v%>hM36`%kVqr|0D>Su5Cn90ccZ1H1z$F*V(E06BuOGs6bV4ZA&MeNl0@lr
zx|%H2l=E2AH28cztgNgclgR)8EEWsgZZ{kb2b!9i007U=&v<-%#L3ACG))5lSglqp
zEG%GpdKwms<?9~D<8gAiT)HQWF_LAOve|4|53<=T$+Aq0F@2rO<)U~zZaBXLe0_aQ
zcDtPbklk*l-Q8XKUEAH=Ez-EYzOD?8$K(0}#uz1&N%~VuCX>4NcDudAa~+(^<@E3}
z#z<Aw5;0BFNRlM#?Cc~_6iF0CYHx3+xw$!ddwVOHud1pJcez}Y%jHVJtE;Q}*Ol`$
z7z~y@(Q9jKWj!xMadmaI7@SV0$!fI{fQoxMGc!{bJUl#HanAve)oRsK%>)2`zaN=Q
z28=Oyz1~VW|3~k<UN0D9$Ye6``~3g_69CAv3;>v&oi$t-iA1omu~GFh3I>CSL?VXo
z3fcu0VzC$jAdAIfn5UbYn`AbdX>f3md_G^<P|wfL)8ynNnayU}+S)SAbBo1704NrV
z5dwh#0igc=e#8A~ZEYov<EXB#jub_qzP>)Hsi`S~c6WEv?d>f!G&B&$apZJ54Ym6F
z`w0LA0s-O*m%YQ`C<)Ka%?<AF?*Rb$d>$hsBbb_+!ut9;K0ZEv?v=>|MNu$5KCWM_
zcXxNVxw(NTibZ+_Mk0}b4ldlizgjAl0s!zlkD;L<G&eV6d3hO6PftbjY&IK4M@P}t
z)`p#(9jK~`R4P>hE-(^_#LvT3&5n+az!-z7syID8Eh>LDn+?%u6irP{=;`Uf<>e(z
zrs}esAP9PuF|y9iPJDiTVq#(f0FcdQF*Y`a#l=Mc!06~Gwzs#jw6p{O*xTEK$Kx^7
zDlh~=fT;j}e0(&V{POaG#>Ph73qcTyKJxYT6*il#C<3pquZCI$h9C%)(<vMd6UTA1
zwY5cxqEI*-ru+MQ`tjojaU4e+$5DNKJt>Mp`}_NJc6LUGhlj**9331SR8A)%(z^>;
zmJPui$5Cr*D-8?`P;G6k{;V)+Yir5l@laP+m;Njq4i{<3vaEM0`duwal3ta5wP-Y2
z0{QBQMx#Yqg(@XUQuQK{&*w=Hgx`h=f<XCvzG9K6S{6g05b-?!Whl?{6bgl^mPNhU
z(=-ikw;LB17hsIx`1lw+&jSFiuCCzs`=KZb-rwI1PpsK&hSTZ9<m4neIywLVxm*st
zy}dX;KZncZ!pX_Wzs=vbw?5z6?ERPR?f<Kx|JGlazx~tp4`iqQklDNcX#fBK07*qo
IM6N<$f;j3Kz5oCK

literal 0
HcmV?d00001

diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index c1a0a5ed4..48c83e701 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit c1a0a5ed4650a2bacd4d4b05a1d16f77729f3cab
+Subproject commit 48c83e701d2fe7562e2e320d1e210d71e09cdc7c