Update to pixman 0.22.4. Tested by shadchin@, krw@.

4 files changed, 44 insertions, 32 deletions

diff --git a/lib/pixman/demos/Makefile.am b/lib/pixman/demos/Makefile.am
index f08303bc4..070c2d748 100644
--- a/lib/pixman/demos/Makefile.am
+++ b/lib/pixman/demos/Makefile.am
@@ -1,10 +1,10 @@
 if HAVE_GTK
 
-AM_CFLAGS = @OPENMP_CFLAGS@
-AM_LDFLAGS = @OPENMP_CFLAGS@
+AM_CFLAGS = $(OPENMP_CFLAGS)
+AM_LDFLAGS = $(OPENMP_CFLAGS)
 
-LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS)
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS)
+LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS)
+INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS)
 
 GTK_UTILS = gtk-utils.c gtk-utils.h
 
diff --git a/lib/pixman/demos/Makefile.in b/lib/pixman/demos/Makefile.in
index d4f953bc6..abe66f202 100644
--- a/lib/pixman/demos/Makefile.in
+++ b/lib/pixman/demos/Makefile.in
@@ -61,14 +61,14 @@ alpha_test_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 @HAVE_GTK_TRUE@alpha_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__clip_in_SOURCES_DIST = clip-in.c gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_clip_in_OBJECTS = clip-in.$(OBJEXT) $(am__objects_1)
 clip_in_OBJECTS = $(am_clip_in_OBJECTS)
 clip_in_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@clip_in_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__clip_test_SOURCES_DIST = clip-test.c gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_clip_test_OBJECTS = clip-test.$(OBJEXT) \
 @HAVE_GTK_TRUE@	$(am__objects_1)
@@ -76,7 +76,7 @@ clip_test_OBJECTS = $(am_clip_test_OBJECTS)
 clip_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@clip_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__composite_test_SOURCES_DIST = composite-test.c gtk-utils.c \
 	gtk-utils.h
 @HAVE_GTK_TRUE@am_composite_test_OBJECTS = composite-test.$(OBJEXT) \
@@ -85,7 +85,7 @@ composite_test_OBJECTS = $(am_composite_test_OBJECTS)
 composite_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@composite_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__convolution_test_SOURCES_DIST = convolution-test.c gtk-utils.c \
 	gtk-utils.h
 @HAVE_GTK_TRUE@am_convolution_test_OBJECTS =  \
@@ -94,7 +94,7 @@ convolution_test_OBJECTS = $(am_convolution_test_OBJECTS)
 convolution_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@convolution_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__gradient_test_SOURCES_DIST = gradient-test.c gtk-utils.c \
 	gtk-utils.h
 @HAVE_GTK_TRUE@am_gradient_test_OBJECTS = gradient-test.$(OBJEXT) \
@@ -103,7 +103,7 @@ gradient_test_OBJECTS = $(am_gradient_test_OBJECTS)
 gradient_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@gradient_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__radial_test_SOURCES_DIST = radial-test.c ../test/utils.c \
 	../test/utils.h gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_radial_test_OBJECTS = radial-test.$(OBJEXT) \
@@ -112,7 +112,7 @@ radial_test_OBJECTS = $(am_radial_test_OBJECTS)
 radial_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@radial_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__screen_test_SOURCES_DIST = screen-test.c gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_screen_test_OBJECTS = screen-test.$(OBJEXT) \
 @HAVE_GTK_TRUE@	$(am__objects_1)
@@ -120,7 +120,7 @@ screen_test_OBJECTS = $(am_screen_test_OBJECTS)
 screen_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@screen_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__trap_test_SOURCES_DIST = trap-test.c gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_trap_test_OBJECTS = trap-test.$(OBJEXT) \
 @HAVE_GTK_TRUE@	$(am__objects_1)
@@ -128,7 +128,7 @@ trap_test_OBJECTS = $(am_trap_test_OBJECTS)
 trap_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@trap_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__tri_test_SOURCES_DIST = tri-test.c ../test/utils.c ../test/utils.h \
 	gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@am_tri_test_OBJECTS = tri-test.$(OBJEXT) \
@@ -137,7 +137,7 @@ tri_test_OBJECTS = $(am_tri_test_OBJECTS)
 tri_test_LDADD = $(LDADD)
 @HAVE_GTK_TRUE@tri_test_DEPENDENCIES =  \
 @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -181,47 +181,51 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEP_CFLAGS = @DEP_CFLAGS@
 DEP_LIBS = @DEP_LIBS@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
 HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
+HAVE_LIBPNG = @HAVE_LIBPNG@
 HAVE_PTHREAD_SETSPECIFIC = @HAVE_PTHREAD_SETSPECIFIC@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION_INFO = @LT_VERSION_INFO@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MMX_CFLAGS = @MMX_CFLAGS@
 MMX_LDFLAGS = @MMX_LDFLAGS@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -235,6 +239,8 @@ PIXMAN_VERSION_MAJOR = @PIXMAN_VERSION_MAJOR@
 PIXMAN_VERSION_MICRO = @PIXMAN_VERSION_MICRO@
 PIXMAN_VERSION_MINOR = @PIXMAN_VERSION_MINOR@
 PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -249,27 +255,27 @@ STUBS_LIBS = @STUBS_LIBS@
 TESTPROGS_EXTRA_LDFLAGS = @TESTPROGS_EXTRA_LDFLAGS@
 TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR = @TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR@
 TOOLCHAIN_SUPPORTS__THREAD = @TOOLCHAIN_SUPPORTS__THREAD@
+USE_ARM_IWMMXT_FALSE = @USE_ARM_IWMMXT_FALSE@
+USE_ARM_IWMMXT_TRUE = @USE_ARM_IWMMXT_TRUE@
 USE_ARM_NEON_FALSE = @USE_ARM_NEON_FALSE@
 USE_ARM_NEON_TRUE = @USE_ARM_NEON_TRUE@
 USE_ARM_SIMD_FALSE = @USE_ARM_SIMD_FALSE@
 USE_ARM_SIMD_TRUE = @USE_ARM_SIMD_TRUE@
 USE_GCC_INLINE_ASM_FALSE = @USE_GCC_INLINE_ASM_FALSE@
 USE_GCC_INLINE_ASM_TRUE = @USE_GCC_INLINE_ASM_TRUE@
-USE_MMX_FALSE = @USE_MMX_FALSE@
-USE_MMX_TRUE = @USE_MMX_TRUE@
 USE_SSE2_FALSE = @USE_SSE2_FALSE@
 USE_SSE2_TRUE = @USE_SSE2_TRUE@
 USE_VMX_FALSE = @USE_VMX_FALSE@
 USE_VMX_TRUE = @USE_VMX_TRUE@
+USE_X86_MMX_FALSE = @USE_X86_MMX_FALSE@
+USE_X86_MMX_TRUE = @USE_X86_MMX_TRUE@
 VERSION = @VERSION@
 VMX_CFLAGS = @VMX_CFLAGS@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -310,10 +316,10 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@HAVE_GTK_TRUE@AM_CFLAGS = @OPENMP_CFLAGS@
-@HAVE_GTK_TRUE@AM_LDFLAGS = @OPENMP_CFLAGS@
-@HAVE_GTK_TRUE@LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS)
-@HAVE_GTK_TRUE@INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS)
+@HAVE_GTK_TRUE@AM_CFLAGS = $(OPENMP_CFLAGS)
+@HAVE_GTK_TRUE@AM_LDFLAGS = $(OPENMP_CFLAGS)
+@HAVE_GTK_TRUE@LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS)
+@HAVE_GTK_TRUE@INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS)
 @HAVE_GTK_TRUE@GTK_UTILS = gtk-utils.c gtk-utils.h
 @HAVE_GTK_TRUE@DEMOS = \
 @HAVE_GTK_TRUE@	clip-test		\
diff --git a/lib/pixman/demos/alpha-test.c b/lib/pixman/demos/alpha-test.c
index 92c208142..54e30fad5 100644
--- a/lib/pixman/demos/alpha-test.c
+++ b/lib/pixman/demos/alpha-test.c
@@ -40,10 +40,12 @@ main (int argc, char **argv)
     };
 #endif
 
+#if 0
     pixman_point_fixed_t c_inner;
     pixman_point_fixed_t c_outer;
     pixman_fixed_t r_inner;
     pixman_fixed_t r_outer;
+#endif
     
     for (i = 0; i < WIDTH * HEIGHT; ++i)
 	alpha[i] = 0x4f00004f; /* pale blue */
@@ -69,6 +71,7 @@ main (int argc, char **argv)
 					src,
 					WIDTH * 4);
     
+#if 0
     c_inner.x = pixman_double_to_fixed (50.0);
     c_inner.y = pixman_double_to_fixed (50.0);
     c_outer.x = pixman_double_to_fixed (50.0);
@@ -76,7 +79,6 @@ main (int argc, char **argv)
     r_inner = 0;
     r_outer = pixman_double_to_fixed (50.0);
     
-#if 0
     grad_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);
 #endif
diff --git a/lib/pixman/demos/gradient-test.c b/lib/pixman/demos/gradient-test.c
index fc84844b0..20f78a6aa 100644
--- a/lib/pixman/demos/gradient-test.c
+++ b/lib/pixman/demos/gradient-test.c
@@ -36,10 +36,12 @@ main (int argc, char **argv)
     };
 #endif
 
+#if 0
     pixman_point_fixed_t c_inner;
     pixman_point_fixed_t c_outer;
     pixman_fixed_t r_inner;
     pixman_fixed_t r_outer;
+#endif
     
     for (i = 0; i < WIDTH * HEIGHT; ++i)
 	dest[i] = 0x4f00004f; /* pale blue */
@@ -49,6 +51,7 @@ main (int argc, char **argv)
 					 dest,
 					 WIDTH * 4);
 
+#if 0
     c_inner.x = pixman_double_to_fixed (50.0);
     c_inner.y = pixman_double_to_fixed (50.0);
     c_outer.x = pixman_double_to_fixed (50.0);
@@ -58,6 +61,7 @@ main (int argc, char **argv)
     
     src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);
+#endif
 #if 0
     src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);