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

Pixman fixes

Browse Source
This commit is contained in:
Jay Sorg 2016-08-11 22:18:26 -07:00
parent bb7bac2d9b
commit d35e57b117
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/pixman-region.c
View File

@ -204,7 +204,7 @@ alloc_data (size_t n)
if (!sz) if (!sz)
return NULL; return NULL;
return malloc (sz); return (region_data_type_t *) malloc(sz);
} }
#define FREE_DATA(reg) if ((reg)->data && (reg)->data->size) free ((reg)->data) #define FREE_DATA(reg) if ((reg)->data && (reg)->data->size) free ((reg)->data)
@ -1703,7 +1703,7 @@ validate (region_type_t * badreg)
if (ri == stack_regions) if (ri == stack_regions)
{ {
rit = malloc (data_size); rit = (region_info_t *) malloc(data_size);
if (!rit) if (!rit)
goto bail; goto bail;
memcpy (rit, ri, num_ri * sizeof (region_info_t)); memcpy (rit, ri, num_ri * sizeof (region_info_t));

2
common/pixman-region16.c
View File

@ -42,8 +42,6 @@
#define MIN(x1, x2) ((x1) < (x2) ? (x1) : (x2)) #define MIN(x1, x2) ((x1) < (x2) ? (x1) : (x2))
#define MAX(x1, x2) ((x1) > (x2) ? (x1) : (x2)) #define MAX(x1, x2) ((x1) > (x2) ? (x1) : (x2))
typedef int pixman_bool_t;
typedef pixman_box16_t box_type_t; typedef pixman_box16_t box_type_t;
typedef pixman_region16_data_t region_data_type_t; typedef pixman_region16_data_t region_data_type_t;
typedef pixman_region16_t region_type_t; typedef pixman_region16_t region_type_t;

2
configure.ac
View File

@ -114,7 +114,7 @@ AC_ARG_ENABLE(mp3lame, AS_HELP_STRING([--enable-mp3lame],
AM_CONDITIONAL(XRDP_MP3LAME, [test x$enable_mp3lame = xyes]) AM_CONDITIONAL(XRDP_MP3LAME, [test x$enable_mp3lame = xyes])
AC_ARG_ENABLE(pixman, AS_HELP_STRING([--enable-pixman], AC_ARG_ENABLE(pixman, AS_HELP_STRING([--enable-pixman],
[Use pixman library (default: no)]), [Use pixman library (default: no)]),
[], [enable_pimanno]) [], [enable_pixman=no])
AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes]) AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes])
# checking for openssl # checking for openssl