[cairo-commit] 3 commits - build/configure.ac.analysis src/cairo-ps-surface.c test/operator-alpha-rgb24-ref.png

[Chris Wilson]

 build/configure.ac.analysis       |    6 ++++--
 src/cairo-ps-surface.c            |    2 +-
 test/operator-alpha-rgb24-ref.png |binary
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e55d5a76d75d78c8a1e9ac4e9f5eda32f378f413
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 17 22:23:43 2008 +0100

    [ps] Silence compiler warning.

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 282188a..bef876c 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -1479,7 +1479,7 @@ _gradient_pattern_supported (cairo_ps_surface_t    *surface,
     cairo_gradient_pattern_t *gradient = (cairo_gradient_pattern_t *) pattern;
     uint16_t alpha;
     cairo_extend_t extend;
-    int i;
+    unsigned int i;
 
     if (surface->ps_level == CAIRO_PS_LEVEL_2)
 	return FALSE;
commit e83675dee14581c3938191a4bbaf3c4e091a4304
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 17 22:12:35 2008 +0100

    [test] Add missing operator-alpha ref image.

diff --git a/test/operator-alpha-rgb24-ref.png b/test/operator-alpha-rgb24-ref.png
new file mode 100644
index 0000000..3263550
Binary files /dev/null and b/test/operator-alpha-rgb24-ref.png differ
commit 998310ef4d710bf1a9505038b0fa411b29c958ca
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 17 22:07:00 2008 +0100

    [gcov] Use --coverage instead.
    
    --coverage is a synonym for "--fprofile-arcs --ftest-coverage" during
    compilation *and* "--lgcov" during linking. One might think this would
    be a perfect workaround for the broken debian libtool which stopped the
    linker seeing -lgcov - but they strip CFLAGS as well. Oh well.

diff --git a/build/configure.ac.analysis b/build/configure.ac.analysis
index 7afc9e0..f0d41df 100644
--- a/build/configure.ac.analysis
+++ b/build/configure.ac.analysis
@@ -69,8 +69,10 @@ dnl  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
   changequote([,])
 
   dnl Add the special gcc flags
-  CAIRO_CFLAGS="$CAIRO_CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-  CAIRO_LIBS="$CAIRO_LIBS -lgcov"
+  dnl In order to workaround a debian bug in libtool where they strip
+  dnl $dependency_libs from the link line and CFLAGS, we need to pass
+  dnl --coverage via LDFLAGS.
+  CAIRO_CC_TRY_FLAG([--coverage], [CAIRO_CFLAGS="$CAIRO_CFLAGS -O0 --coverage"])
 fi
 AM_CONDITIONAL(CAIRO_HAS_LCOV, test "x$cairo_has_lcov" = "xyes")