From 971f91129059e5d8704502bc83d94e83dfda9e66 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Fri, 23 Jul 2021 11:41:04 +0100
Subject: [PATCH] Add xrdp_bitmap_load() jpg and png test cases

---
 tests/xrdp/Makefile.am          |   4 +++-
 tests/xrdp/test1.jpg            | Bin 0 -> 2152 bytes
 tests/xrdp/test_alpha_blend.png | Bin 0 -> 1131 bytes
 tests/xrdp/test_bitmap_load.c   |   9 +++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 tests/xrdp/test1.jpg
 create mode 100644 tests/xrdp/test_alpha_blend.png

diff --git a/tests/xrdp/Makefile.am b/tests/xrdp/Makefile.am
index 56cbce7c..2a2742d0 100644
--- a/tests/xrdp/Makefile.am
+++ b/tests/xrdp/Makefile.am
@@ -16,7 +16,9 @@ EXTRA_DIST = \
   test_24bit.bmp \
   test_not4_4bit.bmp \
   test_not4_8bit.bmp \
-  test_not4_24bit.bmp
+  test_not4_24bit.bmp \
+  test1.jpg \
+  test_alpha_blend.png
 
 TESTS = test_xrdp
 check_PROGRAMS = test_xrdp
diff --git a/tests/xrdp/test1.jpg b/tests/xrdp/test1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..93434c002513ff5dd9e3fd503d59d05f122be5ce
GIT binary patch
literal 2152
zcmd^<Ur1AN6vw~6d)+kK>|R|qW`7pV5KOepTv2J8e_CkGWvC_CcBh-*=G-Rzp+G3`
zp%<x#${w2bP!BysMA2K654{9IkXjNU)I;=CR1YDy^Sc{P!6`jjhwc78obx^BcYo)e
zd(|oRBcvk@t_Co&QdSD6v%&+H)7j<r9BXhj)l&cv5`9W2mQ?|S!tto5(P3@xIBCuP
zglufU8dRaktHdIQ-0mi1w4ZN5m4G*8yjDip(gCBtJEj24O5s{15{(m|Cf;)<9^rh0
z*rWu#e&YMYJEC-h#8cewOY&FF0gVMhn4+y7C!NhiYz-`6-vU;G(GY2Nlg8!`g{i*K
zo@77g3!FoJgLH42@e>-l!zYf@YNP)~G{S{uxM774gXl#c;wYmvOr97#6nA9Ew`lop
z%JNZGFBHnCLq9_BYWd*LfHY+3-o|<=cWEwWZ~(dws`|Yc$i4>5ji~DHF;$%#2gDiR
zSvZ~Fp8)JX$Ul<y*=_^tE(4Dz(mvmH;K?vxo{o5<UTq(du0l@_@a-;O>;MX01G%S?
zeWMtU<IW_|O1)}&1>773wg;$oXNGg<P{MrQmer*Cr@n_1(pp2FAy>*X=H<&$fw{zD
zE-W<f+*Z7)WMAch{d+6z)wPE^kJi?;)mPiyp_aBTUmzGb*gSA9;y>Hj9Z+}?Cg<my
z*PF{NmU6{mcPM{t>T}3BjOJWqG6b24GE*n$72z)z@58+5^jQ=zlUH0E$kORW^&Jf4
z79>%k5uUxmhm3mKGLTHaRT}=E9hV+H(vGkHJbX`sipiNF4(#dJ7tLX)`eoH196Ue7
zK{Q@`sX2;9HzzcB(G}I!f20V_l1W-TNI-(-D2FDD=>%-y3VCUT$XE?qRw1Mn8F$gw
uq;|=uU^QE5m(*-)-vt_PZdYA4`mJ70-uY_0t}qqSic^tNEc48{V)_pxR8nC8

literal 0
HcmV?d00001

diff --git a/tests/xrdp/test_alpha_blend.png b/tests/xrdp/test_alpha_blend.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a7176e4b264a40cd7c7c391cfb9009a579a2a9
GIT binary patch
literal 1131
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$5xn)7d$|)7e>}peR2rGbfdS
zL1SX=L|c!;4l+mMgSRS$vUhh_q^!`35)duCq9wA>X@zK1slm=K+_OwnH1+zLvJW2Y
zKf0>9d-FQJbxjIC7#}@*w&aD9>OXzWEgfGU?2v!|&i36sMyIVOOjhU0TqwEib7WDH
z)?O{PI6(*dDuXV*nUTlls2sgmRCD+6@$0)e&S%xWJAZL)nhx6!mq(FlGt54+ef+X4
zx8R;S-^M*_gyswP&n$6#<i1W@ZhzsqojM=ROql6&M!3D>XpFG7@0m}_+-zKB!c6CW
zYMpXi>$&c^sEub{eSf0QllEn5>blD^PCVTaO)P?3r!*FDNDD@l2I;6|*xx#2|KgWw
zk>(SvhKb3Hsu>ev?SIJsd3WuUpI?RNL5&Ol9$CmAc1RFk5i0Zi_l?3V^@jhFJ1$B8
z3lg32Q)Ta^3y0ht-kTK^-n}rz_CXQ5M1@gGaG9#Tui|Xhd*@%wzT|LU_rlg^U&HPn
zf5|*y$+}182M#J4Oj`WrtJwQ@Iq%-yH~#vsjv?qy(JZcy=b3=<!j|Oi?!xdN2pM|!
zd&mJrI14-?iy0X7ltGxWVyS%@P>{XE)7O>#DZ3b-9{(N9v!x6SOzEC3jv*Dd-d=0u
zWH8`hK6vAAx!-kxJ<^I(mtS7;aLvbG%WZ`lfa(}H7!(+&#h{)^a2E}bksD5{td;be
wf8fReeg**s2T(>~p%R07Cc#}aU`9^+A(6rMcjhk6rwl;g>FVdQ&MBb@07@Jb-~a#s

literal 0
HcmV?d00001

diff --git a/tests/xrdp/test_bitmap_load.c b/tests/xrdp/test_bitmap_load.c
index cc453fa1..ebb59c00 100644
--- a/tests/xrdp/test_bitmap_load.c
+++ b/tests/xrdp/test_bitmap_load.c
@@ -299,6 +299,7 @@ make_suite_test_bitmap_load(void)
 {
     Suite *s;
     TCase *tc_bitmap_load;
+    TCase *tc_other_load;
 
     s = suite_create("BitmapLoad");
 
@@ -320,5 +321,13 @@ make_suite_test_bitmap_load(void)
 
     suite_add_tcase(s, tc_bitmap_load);
 
+#ifdef USE_IMLIB2
+    tc_other_load = tcase_create("xrdp_other_load");
+    tcase_add_checked_fixture(tc_other_load, setup, teardown);
+    tcase_add_test(tc_other_load, test_png_load__blend_ok);
+    tcase_add_test(tc_other_load, test_jpg_load__ok);
+    suite_add_tcase(s, tc_other_load);
+#endif
+
     return s;
 }