Update to pixman 0.22.2.

0.22.0 was tested by many. 0.22.2 only add a few bug fixes.
Note that on amd64 a recent ld.so is needed to avoid random bus errors.

1 files changed, 115 insertions, 192 deletions

diff --git a/lib/pixman/test/Makefile.in b/lib/pixman/test/Makefile.in
index bc485b0c1..1f3960c01 100644
--- a/lib/pixman/test/Makefile.in
+++ b/lib/pixman/test/Makefile.in
@@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@@ -36,8 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_GTK_TRUE@am__append_1 = $(GTK_CFLAGS)
-noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,115 +46,102 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__EXEEXT_1 = a1-trap-test$(EXEEXT) region-test$(EXEEXT) \
-	region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \
-	oob-test$(EXEEXT) window-test$(EXEEXT) \
-	gradient-crash-test$(EXEEXT) trap-crasher$(EXEEXT) \
+am__EXEEXT_1 = a1-trap-test$(EXEEXT) pdf-op-test$(EXEEXT) \
+	region-test$(EXEEXT) region-translate-test$(EXEEXT) \
+	fetch-test$(EXEEXT) oob-test$(EXEEXT) trap-crasher$(EXEEXT) \
 	alpha-loop$(EXEEXT) scaling-crash-test$(EXEEXT) \
-	alphamap$(EXEEXT) blitters-test$(EXEEXT) scaling-test$(EXEEXT) \
-	affine-test$(EXEEXT) composite$(EXEEXT)
-@HAVE_GTK_TRUE@am__EXEEXT_2 = clip-test$(EXEEXT) clip-in$(EXEEXT) \
-@HAVE_GTK_TRUE@	composite-test$(EXEEXT) gradient-test$(EXEEXT) \
-@HAVE_GTK_TRUE@	alpha-test$(EXEEXT) screen-test$(EXEEXT) \
-@HAVE_GTK_TRUE@	convolution-test$(EXEEXT) trap-test$(EXEEXT)
-am__EXEEXT_3 = lowlevel-blt-bench$(EXEEXT)
+	scaling-helpers-test$(EXEEXT) gradient-crash-test$(EXEEXT) \
+	alphamap$(EXEEXT) stress-test$(EXEEXT) \
+	composite-traps-test$(EXEEXT) blitters-test$(EXEEXT) \
+	scaling-test$(EXEEXT) affine-test$(EXEEXT) composite$(EXEEXT)
+am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 a1_trap_test_SOURCES = a1-trap-test.c
 a1_trap_test_OBJECTS = a1-trap-test.$(OBJEXT)
-am__DEPENDENCIES_1 = $(top_builddir)/pixman/libpixman-1.la
-a1_trap_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+a1_trap_test_LDADD = $(LDADD)
+a1_trap_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_affine_test_OBJECTS = affine-test.$(OBJEXT) utils.$(OBJEXT)
 affine_test_OBJECTS = $(am_affine_test_OBJECTS)
-affine_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+affine_test_LDADD = $(LDADD)
+affine_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_alpha_loop_OBJECTS = alpha-loop.$(OBJEXT) utils.$(OBJEXT)
 alpha_loop_OBJECTS = $(am_alpha_loop_OBJECTS)
-alpha_loop_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__alpha_test_SOURCES_DIST = alpha-test.c gtk-utils.c gtk-utils.h
-@HAVE_GTK_TRUE@am__objects_1 = gtk-utils.$(OBJEXT)
-@HAVE_GTK_TRUE@am_alpha_test_OBJECTS = alpha-test.$(OBJEXT) \
-@HAVE_GTK_TRUE@	$(am__objects_1)
-alpha_test_OBJECTS = $(am_alpha_test_OBJECTS)
-am__DEPENDENCIES_2 =
-@HAVE_GTK_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_2)
-@HAVE_GTK_TRUE@alpha_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
+alpha_loop_LDADD = $(LDADD)
+alpha_loop_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_alphamap_OBJECTS = alphamap.$(OBJEXT) utils.$(OBJEXT)
 alphamap_OBJECTS = $(am_alphamap_OBJECTS)
-alphamap_DEPENDENCIES = $(am__DEPENDENCIES_1)
+alphamap_LDADD = $(LDADD)
+alphamap_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_blitters_test_OBJECTS = blitters-test.$(OBJEXT) utils.$(OBJEXT)
 blitters_test_OBJECTS = $(am_blitters_test_OBJECTS)
-blitters_test_DEPENDENCIES = $(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)
-@HAVE_GTK_TRUE@clip_in_DEPENDENCIES = $(am__DEPENDENCIES_3)
-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)
-clip_test_OBJECTS = $(am_clip_test_OBJECTS)
-@HAVE_GTK_TRUE@clip_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
+blitters_test_LDADD = $(LDADD)
+blitters_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_composite_OBJECTS = composite.$(OBJEXT) utils.$(OBJEXT)
 composite_OBJECTS = $(am_composite_OBJECTS)
-composite_DEPENDENCIES = $(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) \
-@HAVE_GTK_TRUE@	$(am__objects_1)
-composite_test_OBJECTS = $(am_composite_test_OBJECTS)
-@HAVE_GTK_TRUE@composite_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am__convolution_test_SOURCES_DIST = convolution-test.c gtk-utils.c \
-	gtk-utils.h
-@HAVE_GTK_TRUE@am_convolution_test_OBJECTS =  \
-@HAVE_GTK_TRUE@	convolution-test.$(OBJEXT) $(am__objects_1)
-convolution_test_OBJECTS = $(am_convolution_test_OBJECTS)
-@HAVE_GTK_TRUE@convolution_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
+composite_LDADD = $(LDADD)
+composite_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
+am_composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT) \
+	utils.$(OBJEXT)
+composite_traps_test_OBJECTS = $(am_composite_traps_test_OBJECTS)
+composite_traps_test_LDADD = $(LDADD)
+composite_traps_test_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
 fetch_test_SOURCES = fetch-test.c
 fetch_test_OBJECTS = fetch-test.$(OBJEXT)
-fetch_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
-gradient_crash_test_SOURCES = gradient-crash-test.c
-gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
-gradient_crash_test_DEPENDENCIES = $(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) \
-@HAVE_GTK_TRUE@	$(am__objects_1)
-gradient_test_OBJECTS = $(am_gradient_test_OBJECTS)
-@HAVE_GTK_TRUE@gradient_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
+fetch_test_LDADD = $(LDADD)
+fetch_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
+am_gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT) \
+	utils.$(OBJEXT)
+gradient_crash_test_OBJECTS = $(am_gradient_crash_test_OBJECTS)
+gradient_crash_test_LDADD = $(LDADD)
+gradient_crash_test_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
 am_lowlevel_blt_bench_OBJECTS = lowlevel-blt-bench.$(OBJEXT) \
 	utils.$(OBJEXT)
 lowlevel_blt_bench_OBJECTS = $(am_lowlevel_blt_bench_OBJECTS)
-lowlevel_blt_bench_DEPENDENCIES = $(am__DEPENDENCIES_1)
+lowlevel_blt_bench_LDADD = $(LDADD)
+lowlevel_blt_bench_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
 oob_test_SOURCES = oob-test.c
 oob_test_OBJECTS = oob-test.$(OBJEXT)
-oob_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+oob_test_LDADD = $(LDADD)
+oob_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
+am_pdf_op_test_OBJECTS = pdf-op-test.$(OBJEXT) utils.$(OBJEXT)
+pdf_op_test_OBJECTS = $(am_pdf_op_test_OBJECTS)
+pdf_op_test_LDADD = $(LDADD)
+pdf_op_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 am_region_test_OBJECTS = region-test.$(OBJEXT) utils.$(OBJEXT)
 region_test_OBJECTS = $(am_region_test_OBJECTS)
-region_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+region_test_LDADD = $(LDADD)
+region_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 region_translate_test_SOURCES = region-translate-test.c
 region_translate_test_OBJECTS = region-translate-test.$(OBJEXT)
-region_translate_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+region_translate_test_LDADD = $(LDADD)
+region_translate_test_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
 scaling_crash_test_SOURCES = scaling-crash-test.c
 scaling_crash_test_OBJECTS = scaling-crash-test.$(OBJEXT)
-scaling_crash_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+scaling_crash_test_LDADD = $(LDADD)
+scaling_crash_test_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
+am_scaling_helpers_test_OBJECTS = scaling-helpers-test.$(OBJEXT) \
+	utils.$(OBJEXT)
+scaling_helpers_test_OBJECTS = $(am_scaling_helpers_test_OBJECTS)
+scaling_helpers_test_LDADD = $(LDADD)
+scaling_helpers_test_DEPENDENCIES =  \
+	$(top_builddir)/pixman/libpixman-1.la
 am_scaling_test_OBJECTS = scaling-test.$(OBJEXT) utils.$(OBJEXT)
 scaling_test_OBJECTS = $(am_scaling_test_OBJECTS)
-scaling_test_DEPENDENCIES = $(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)
-screen_test_OBJECTS = $(am_screen_test_OBJECTS)
-@HAVE_GTK_TRUE@screen_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
+scaling_test_LDADD = $(LDADD)
+scaling_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
+am_stress_test_OBJECTS = stress-test.$(OBJEXT) utils.$(OBJEXT)
+stress_test_OBJECTS = $(am_stress_test_OBJECTS)
+stress_test_LDADD = $(LDADD)
+stress_test_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 trap_crasher_SOURCES = trap-crasher.c
 trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
-trap_crasher_DEPENDENCIES = $(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)
-trap_test_OBJECTS = $(am_trap_test_OBJECTS)
-@HAVE_GTK_TRUE@trap_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
-window_test_SOURCES = window-test.c
-window_test_OBJECTS = window-test.$(OBJEXT)
-window_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+trap_crasher_LDADD = $(LDADD)
+trap_crasher_DEPENDENCIES = $(top_builddir)/pixman/libpixman-1.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -168,28 +154,23 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = a1-trap-test.c $(affine_test_SOURCES) $(alpha_loop_SOURCES) \
-	$(alpha_test_SOURCES) $(alphamap_SOURCES) \
-	$(blitters_test_SOURCES) $(clip_in_SOURCES) \
-	$(clip_test_SOURCES) $(composite_SOURCES) \
-	$(composite_test_SOURCES) $(convolution_test_SOURCES) \
-	fetch-test.c gradient-crash-test.c $(gradient_test_SOURCES) \
-	$(lowlevel_blt_bench_SOURCES) oob-test.c \
-	$(region_test_SOURCES) region-translate-test.c \
-	scaling-crash-test.c $(scaling_test_SOURCES) \
-	$(screen_test_SOURCES) trap-crasher.c $(trap_test_SOURCES) \
-	window-test.c
-DIST_SOURCES = a1-trap-test.c $(affine_test_SOURCES) \
-	$(alpha_loop_SOURCES) $(am__alpha_test_SOURCES_DIST) \
 	$(alphamap_SOURCES) $(blitters_test_SOURCES) \
-	$(am__clip_in_SOURCES_DIST) $(am__clip_test_SOURCES_DIST) \
-	$(composite_SOURCES) $(am__composite_test_SOURCES_DIST) \
-	$(am__convolution_test_SOURCES_DIST) fetch-test.c \
-	gradient-crash-test.c $(am__gradient_test_SOURCES_DIST) \
+	$(composite_SOURCES) $(composite_traps_test_SOURCES) \
+	fetch-test.c $(gradient_crash_test_SOURCES) \
 	$(lowlevel_blt_bench_SOURCES) oob-test.c \
-	$(region_test_SOURCES) region-translate-test.c \
-	scaling-crash-test.c $(scaling_test_SOURCES) \
-	$(am__screen_test_SOURCES_DIST) trap-crasher.c \
-	$(am__trap_test_SOURCES_DIST) window-test.c
+	$(pdf_op_test_SOURCES) $(region_test_SOURCES) \
+	region-translate-test.c scaling-crash-test.c \
+	$(scaling_helpers_test_SOURCES) $(scaling_test_SOURCES) \
+	$(stress_test_SOURCES) trap-crasher.c
+DIST_SOURCES = a1-trap-test.c $(affine_test_SOURCES) \
+	$(alpha_loop_SOURCES) $(alphamap_SOURCES) \
+	$(blitters_test_SOURCES) $(composite_SOURCES) \
+	$(composite_traps_test_SOURCES) fetch-test.c \
+	$(gradient_crash_test_SOURCES) $(lowlevel_blt_bench_SOURCES) \
+	oob-test.c $(pdf_op_test_SOURCES) $(region_test_SOURCES) \
+	region-translate-test.c scaling-crash-test.c \
+	$(scaling_helpers_test_SOURCES) $(scaling_test_SOURCES) \
+	$(stress_test_SOURCES) trap-crasher.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -274,6 +255,8 @@ SSE2_LDFLAGS = @SSE2_LDFLAGS@
 STRIP = @STRIP@
 STUBS_CFLAGS = @STUBS_CFLAGS@
 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_NEON_FALSE = @USE_ARM_NEON_FALSE@
 USE_ARM_NEON_TRUE = @USE_ARM_NEON_TRUE@
@@ -337,86 +320,47 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AM_CFLAGS = @OPENMP_CFLAGS@
-AM_LDFLAGS = @OPENMP_CFLAGS@
-TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \
-	$(am__append_1)
+AM_LDFLAGS = @OPENMP_CFLAGS@ @TESTPROGS_EXTRA_LDFLAGS@
+LDADD = $(top_builddir)/pixman/libpixman-1.la -lm
+INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman
 TESTPROGRAMS = \
 	a1-trap-test		\
+	pdf-op-test		\
 	region-test		\
 	region-translate-test	\
 	fetch-test		\
 	oob-test		\
-	window-test		\
-	gradient-crash-test	\
 	trap-crasher		\
 	alpha-loop		\
 	scaling-crash-test	\
+	scaling-helpers-test	\
+	gradient-crash-test	\
 	alphamap		\
+	stress-test		\
+	composite-traps-test	\
 	blitters-test		\
 	scaling-test		\
 	affine-test		\
 	composite
 
-a1_trap_test_LDADD = $(TEST_LDADD)
-fetch_test_LDADD = $(TEST_LDADD)
-gradient_crash_test_LDADD = $(TEST_LDADD)
-trap_crasher_LDADD = $(TEST_LDADD)
-oob_test_LDADD = $(TEST_LDADD)
-window_test_LDADD = $(TEST_LDADD)
-scaling_crash_test_LDADD = $(TEST_LDADD)
-region_translate_test_LDADD = $(TEST_LDADD)
-region_test_LDADD = $(TEST_LDADD)
+pdf_op_test_SOURCES = pdf-op-test.c utils.c utils.h
 region_test_SOURCES = region-test.c utils.c utils.h
-blitters_test_LDADD = $(TEST_LDADD)
 blitters_test_SOURCES = blitters-test.c utils.c utils.h
-scaling_test_LDADD = $(TEST_LDADD)
+composite_traps_test_SOURCES = composite-traps-test.c utils.c utils.h
 scaling_test_SOURCES = scaling-test.c utils.c utils.h
-affine_test_LDADD = $(TEST_LDADD)
 affine_test_SOURCES = affine-test.c utils.c utils.h
-alphamap_LDADD = $(TEST_LDADD)
 alphamap_SOURCES = alphamap.c utils.c utils.h
-alpha_loop_LDADD = $(TEST_LDADD)
 alpha_loop_SOURCES = alpha-loop.c utils.c utils.h
-composite_LDADD = $(TEST_LDADD)
 composite_SOURCES = composite.c utils.c utils.h
-
-# GTK using test programs
-@HAVE_GTK_TRUE@GTK_LDADD = $(TEST_LDADD) $(GTK_LIBS)
-@HAVE_GTK_TRUE@GTK_UTILS = gtk-utils.c gtk-utils.h
-@HAVE_GTK_TRUE@TESTPROGRAMS_GTK = \
-@HAVE_GTK_TRUE@	clip-test		\
-@HAVE_GTK_TRUE@	clip-in			\
-@HAVE_GTK_TRUE@	composite-test		\
-@HAVE_GTK_TRUE@	gradient-test		\
-@HAVE_GTK_TRUE@	alpha-test		\
-@HAVE_GTK_TRUE@	screen-test		\
-@HAVE_GTK_TRUE@	convolution-test	\
-@HAVE_GTK_TRUE@	trap-test
-
-@HAVE_GTK_TRUE@gradient_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@alpha_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@composite_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@composite_test_SOURCES = composite-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@clip_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@clip_test_SOURCES = clip-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@clip_in_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@clip_in_SOURCES = clip-in.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@trap_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@trap_test_SOURCES = trap-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@screen_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@screen_test_SOURCES = screen-test.c $(GTK_UTILS)
-@HAVE_GTK_TRUE@convolution_test_LDADD = $(GTK_LDADD)
-@HAVE_GTK_TRUE@convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
+gradient_crash_test_SOURCES = gradient-crash-test.c utils.c utils.h
+stress_test_SOURCES = stress-test.c utils.c utils.h
+scaling_helpers_test_SOURCES = scaling-helpers-test.c utils.c utils.h
 
 # Benchmarks
 BENCHMARKS = \
 	lowlevel-blt-bench
 
 lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c utils.c utils.h
-lowlevel_blt_bench_LDADD = $(TEST_LDADD)
 TESTS = $(TESTPROGRAMS)
 all: all-am
 
@@ -467,45 +411,33 @@ affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES)
 alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) 
 	@rm -f alpha-loop$(EXEEXT)
 	$(LINK) $(alpha_loop_LDFLAGS) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS)
-alpha-test$(EXEEXT): $(alpha_test_OBJECTS) $(alpha_test_DEPENDENCIES) 
-	@rm -f alpha-test$(EXEEXT)
-	$(LINK) $(alpha_test_LDFLAGS) $(alpha_test_OBJECTS) $(alpha_test_LDADD) $(LIBS)
 alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) 
 	@rm -f alphamap$(EXEEXT)
 	$(LINK) $(alphamap_LDFLAGS) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS)
 blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) 
 	@rm -f blitters-test$(EXEEXT)
 	$(LINK) $(blitters_test_LDFLAGS) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
-clip-in$(EXEEXT): $(clip_in_OBJECTS) $(clip_in_DEPENDENCIES) 
-	@rm -f clip-in$(EXEEXT)
-	$(LINK) $(clip_in_LDFLAGS) $(clip_in_OBJECTS) $(clip_in_LDADD) $(LIBS)
-clip-test$(EXEEXT): $(clip_test_OBJECTS) $(clip_test_DEPENDENCIES) 
-	@rm -f clip-test$(EXEEXT)
-	$(LINK) $(clip_test_LDFLAGS) $(clip_test_OBJECTS) $(clip_test_LDADD) $(LIBS)
 composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) 
 	@rm -f composite$(EXEEXT)
 	$(LINK) $(composite_LDFLAGS) $(composite_OBJECTS) $(composite_LDADD) $(LIBS)
-composite-test$(EXEEXT): $(composite_test_OBJECTS) $(composite_test_DEPENDENCIES) 
-	@rm -f composite-test$(EXEEXT)
-	$(LINK) $(composite_test_LDFLAGS) $(composite_test_OBJECTS) $(composite_test_LDADD) $(LIBS)
-convolution-test$(EXEEXT): $(convolution_test_OBJECTS) $(convolution_test_DEPENDENCIES) 
-	@rm -f convolution-test$(EXEEXT)
-	$(LINK) $(convolution_test_LDFLAGS) $(convolution_test_OBJECTS) $(convolution_test_LDADD) $(LIBS)
+composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) 
+	@rm -f composite-traps-test$(EXEEXT)
+	$(LINK) $(composite_traps_test_LDFLAGS) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
 fetch-test$(EXEEXT): $(fetch_test_OBJECTS) $(fetch_test_DEPENDENCIES) 
 	@rm -f fetch-test$(EXEEXT)
 	$(LINK) $(fetch_test_LDFLAGS) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
 gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) 
 	@rm -f gradient-crash-test$(EXEEXT)
 	$(LINK) $(gradient_crash_test_LDFLAGS) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
-gradient-test$(EXEEXT): $(gradient_test_OBJECTS) $(gradient_test_DEPENDENCIES) 
-	@rm -f gradient-test$(EXEEXT)
-	$(LINK) $(gradient_test_LDFLAGS) $(gradient_test_OBJECTS) $(gradient_test_LDADD) $(LIBS)
 lowlevel-blt-bench$(EXEEXT): $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_DEPENDENCIES) 
 	@rm -f lowlevel-blt-bench$(EXEEXT)
 	$(LINK) $(lowlevel_blt_bench_LDFLAGS) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
 oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) 
 	@rm -f oob-test$(EXEEXT)
 	$(LINK) $(oob_test_LDFLAGS) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
+pdf-op-test$(EXEEXT): $(pdf_op_test_OBJECTS) $(pdf_op_test_DEPENDENCIES) 
+	@rm -f pdf-op-test$(EXEEXT)
+	$(LINK) $(pdf_op_test_LDFLAGS) $(pdf_op_test_OBJECTS) $(pdf_op_test_LDADD) $(LIBS)
 region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) 
 	@rm -f region-test$(EXEEXT)
 	$(LINK) $(region_test_LDFLAGS) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS)
@@ -515,21 +447,18 @@ region-translate-test$(EXEEXT): $(region_translate_test_OBJECTS) $(region_transl
 scaling-crash-test$(EXEEXT): $(scaling_crash_test_OBJECTS) $(scaling_crash_test_DEPENDENCIES) 
 	@rm -f scaling-crash-test$(EXEEXT)
 	$(LINK) $(scaling_crash_test_LDFLAGS) $(scaling_crash_test_OBJECTS) $(scaling_crash_test_LDADD) $(LIBS)
+scaling-helpers-test$(EXEEXT): $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_DEPENDENCIES) 
+	@rm -f scaling-helpers-test$(EXEEXT)
+	$(LINK) $(scaling_helpers_test_LDFLAGS) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS)
 scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) 
 	@rm -f scaling-test$(EXEEXT)
 	$(LINK) $(scaling_test_LDFLAGS) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
-screen-test$(EXEEXT): $(screen_test_OBJECTS) $(screen_test_DEPENDENCIES) 
-	@rm -f screen-test$(EXEEXT)
-	$(LINK) $(screen_test_LDFLAGS) $(screen_test_OBJECTS) $(screen_test_LDADD) $(LIBS)
+stress-test$(EXEEXT): $(stress_test_OBJECTS) $(stress_test_DEPENDENCIES) 
+	@rm -f stress-test$(EXEEXT)
+	$(LINK) $(stress_test_LDFLAGS) $(stress_test_OBJECTS) $(stress_test_LDADD) $(LIBS)
 trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) 
 	@rm -f trap-crasher$(EXEEXT)
 	$(LINK) $(trap_crasher_LDFLAGS) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
-trap-test$(EXEEXT): $(trap_test_OBJECTS) $(trap_test_DEPENDENCIES) 
-	@rm -f trap-test$(EXEEXT)
-	$(LINK) $(trap_test_LDFLAGS) $(trap_test_OBJECTS) $(trap_test_LDADD) $(LIBS)
-window-test$(EXEEXT): $(window_test_OBJECTS) $(window_test_DEPENDENCIES) 
-	@rm -f window-test$(EXEEXT)
-	$(LINK) $(window_test_LDFLAGS) $(window_test_OBJECTS) $(window_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -540,29 +469,23 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clip-in.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clip-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolution-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-test.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \