mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address review comments and re-test

Browse Source
This commit is contained in:
matt335672 2021-08-09 11:59:33 +01:00
parent ed6e71a54f
commit e35507125c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -166,7 +166,7 @@ AC_ARG_ENABLE(rdpsndaudin, AS_HELP_STRING([--enable-rdpsndaudin],
[], [enable_rdpsndaudin=no])
AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes])
AC_ARG_WITH(imlib2, AC_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use (yes/no/auto/<path>)]),,)
AC_ARG_WITH(imlib2, AC_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/<abs-path>)]),,)
# Obsolete options
AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
@ -220,25 +220,19 @@ AC_CHECK_HEADER([security/pam_constants.h],
# Find imlib2
case "$with_imlib2" in
no) AC_MSG_NOTICE([imlib2 will not be supported])
'' | no) AC_MSG_NOTICE([imlib2 will not be supported])
use_imlib2=no
;;
'' | auto)
PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.10],
[use_imlib2=yes],
[use_imlib2=no])
;;
yes)
PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.10],
[use_imlib2=yes],
[AC_MSG_ERROR([please install libimlib2-dev or imlib2-devel])])
;;
*)
AC_MSG_CHECKING([for imlib2 in $with_imlib2])
/*) AC_MSG_CHECKING([for imlib2 in $with_imlib2])
if test -d $with_imlib2/lib; then
IMLIB2_LIBS="-L $with_imlib2/lib -lImlib2"
IMLIB2_LIBS="-L$with_imlib2/lib -lImlib2"
elif test -d $with_imlib2/lib64; then
IMLIB2_LIBS="-L $with_imlib2/lib64 -lImlib2"
IMLIB2_LIBS="-L$with_imlib2/lib64 -lImlib2"
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([Can't find libImlib2 in $with_imlib2])
@ -254,6 +248,8 @@ case "$with_imlib2" in
AC_SUBST([IMLIB2_LIBS])
AC_SUBST([IMLIB2_CFLAGS])
use_imlib2=yes
;;
*) AC_MSG_ERROR([--with-imlib2 needs yes/no or absolute path])
esac
if test x$use_imlib2 = xyes; then

4
tests/xrdp/test_bitmap_load.c
View File

@ -281,6 +281,7 @@ START_TEST(test_bitmap_load__not_4_pixels_wide_24_bit__ok)
}
END_TEST
#ifdef USE_IMLIB2
START_TEST(test_png_load__blend_ok)
{
load_and_transform_img("test_alpha_blend.png", XBLT_NONE, 0, 0);
@ -292,6 +293,7 @@ START_TEST(test_jpg_load__ok)
load_and_transform_img("test1.jpg", XBLT_NONE, 0, 0);
}
END_TEST
#endif
/******************************************************************************/
Suite *
@ -299,7 +301,9 @@ make_suite_test_bitmap_load(void)
{
Suite *s;
TCase *tc_bitmap_load;
#ifdef USE_IMLIB2
TCase *tc_other_load;
#endif
s = suite_create("BitmapLoad");