[cairo-commit] 3 commits - build/configure.ac.analysis perf/composite-checker.c test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Mon Oct 20 15:08:55 PDT 2008
build/configure.ac.analysis | 8 ++++----
perf/composite-checker.c | 3 ++-
test/Makefile.am | 4 ++++
3 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 4ba9ccc6ab5926d59696f86193f42df2195d7cda
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 20 23:07:38 2008 +0100
[configure.ac.analysis] s/safe/_save/
Rename the temporary variable in line with the convention used by the rest
of the build system.
diff --git a/build/configure.ac.analysis b/build/configure.ac.analysis
index 6ae2a97..7b28d70 100644
--- a/build/configure.ac.analysis
+++ b/build/configure.ac.analysis
@@ -79,8 +79,8 @@ AM_CONDITIONAL(CAIRO_HAS_LCOV, test "x$cairo_has_lcov" = "xyes")
dnl ===========================================================================
dnl Check for some custom valgrind modules
PKG_CHECK_MODULES(VALGRIND, valgrind, [
- safe_CFLAGS="$CFLAGS"
- safe_CPPFLAGS="$CPPFLAGS"
+ _save_CFLAGS="$CFLAGS"
+ _save_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS $VALGRIND_CFLAGS"
CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS"
AC_CHECK_HEADER([valgrind.h], [AC_DEFINE([HAVE_VALGRIND], [1],
@@ -90,6 +90,6 @@ PKG_CHECK_MODULES(VALGRIND, valgrind, [
AC_CHECK_HEADER([memfault.h], [AC_DEFINE([HAVE_MEMFAULT], [1],
[Define to 1 if you have the Valgrind memfault tool])])
CAIRO_CFLAGS="$VALGRIND_CFLAGS $CAIRO_CFLAGS"
- CFLAGS="$safe_CFLAGS"
- CPPFLAGS="$safe_CPPFLAGS"
+ CFLAGS="$_save_CFLAGS"
+ CPPFLAGS="$_save_CPPFLAGS"
], AC_MSG_RESULT(no))
commit 3a45b07af9743a26305c2576f838b4f3ef83bbb8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 20 10:37:46 2008 +0100
[perf] Free images for composite-checker
Fix memleak of the image surfaces.
diff --git a/perf/composite-checker.c b/perf/composite-checker.c
index f38451f..69f48a0 100644
--- a/perf/composite-checker.c
+++ b/perf/composite-checker.c
@@ -90,6 +90,7 @@ composite_checker (cairo_perf_t *perf,
checkerboard = cairo_pattern_create_for_surface (image);
cairo_pattern_set_filter (checkerboard, CAIRO_FILTER_NEAREST);
cairo_pattern_set_extend (checkerboard, CAIRO_EXTEND_REPEAT);
+ cairo_surface_destroy (image);
/* Create the image source pattern. Again we use the NEAREST
* filtering which should be fastest.
@@ -99,10 +100,10 @@ composite_checker (cairo_perf_t *perf,
SRC_SIZE);
src_pattern = cairo_pattern_create_for_surface (image);
cairo_pattern_set_filter (src_pattern, CAIRO_FILTER_NEAREST);
+ cairo_surface_destroy (image);
cairo_perf_run (perf, "composite-checker", do_composite_checker);
- /* Frees the associated surfaces too. */
cairo_pattern_destroy (checkerboard);
cairo_pattern_destroy (src_pattern);
}
commit 86356a9578dc248a755aceb7a04aef67a6c529b3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 20 17:12:21 2008 +0100
[test] Add degenerate-dash to XFAIL.
PS (ghostscript) interprets the degenerate end-caps quite differently, and
perhaps slightly more rationally... Add this to XFAIL, until we have a
definitive specification on how we should behave.
diff --git a/test/Makefile.am b/test/Makefile.am
index 712a010..7a52c8f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -972,6 +972,9 @@ $(REFERENCE_IMAGES)
# components of a pure alpha surface
# big-line - range overflow of fixed-point
# big-trap - range overflow of fixed-point
+# degenerate-dash - needs path editing in PS to convert degenerate
+# end-caps into the shapes as expected by cairo
+# (Or maybe PS is the correct behaviour?)
# degenerate-path - undefined behaviour in PS, needs path editing to
# convert degenerate segments into circles/rectangles
# as expected by cairo
@@ -1011,6 +1014,7 @@ XFAIL_TESTS = \
alpha-similar$(EXEEXT) \
big-line$(EXEEXT) \
big-trap$(EXEEXT) \
+degenerate-dash$(EXEEXT) \
degenerate-path$(EXEEXT) \
device-offset-scale$(EXEEXT) \
extend-pad$(EXEEXT) \
More information about the cairo-commit
mailing list