diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-29 06:41:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-29 06:41:31 +0000 |
| commit | 5c8222f5274c5d56e260d72192d536a7228cfbc8 (patch) | |
| tree | b6b265decf4a31eed6fb5cb2939bfb69365b3cac /pixman | |
| parent | a769e525374f80f0650699a2c97ad020cc76ea6d (diff) | |
| parent | 3eee9271d2345cb54c1778629ba3cf3b804c2671 (diff) | |
| download | vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.gz vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.bz2 vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 7 | ||||
| -rw-r--r-- | pixman/test/alphamap.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index c723337a9..2c32f00d8 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -53,8 +53,8 @@ AC_PREREQ([2.57]) #
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 19)
-m4_define([pixman_micro], 7)
+m4_define([pixman_minor], 21)
+m4_define([pixman_micro], 1)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -726,7 +726,8 @@ if test $support_for__thread = no; then PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"])
PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"])
-
+ PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"])
+
if test $support_for_pthread_setspecific = yes; then
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_DEFINE([HAVE_PTHREAD_SETSPECIFIC], [], [Whether pthread_setspecific() is supported])
diff --git a/pixman/test/alphamap.c b/pixman/test/alphamap.c index 6d150cf69..ba3130e5d 100644 --- a/pixman/test/alphamap.c +++ b/pixman/test/alphamap.c @@ -82,6 +82,7 @@ create_image (pixman_format_code_t format, pixman_format_code_t alpha_format, pixman_image_set_alpha_map (image, alpha,
alpha_origin_x, alpha_origin_y);
+ pixman_image_unref (alpha);
}
return image;
@@ -217,6 +218,10 @@ run_test (int s, int d, int sa, int da, int soff, int doff) }
}
+ pixman_image_set_alpha_map (src, NULL, 0, 0);
+ pixman_image_set_alpha_map (dst, NULL, 0, 0);
+ pixman_image_set_alpha_map (orig_dst, NULL, 0, 0);
+
pixman_image_unref (src);
pixman_image_unref (dst);
pixman_image_unref (orig_dst);
|