[cairo-commit] 3 commits - src/cairo-xlib-surface.c src/check-plt.sh test/.gitignore

[Chris Wilson]

 src/cairo-xlib-surface.c |    8 ++++----
 src/check-plt.sh         |    2 +-
 test/.gitignore          |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 8ae778273799ee9f6d3c13e9c41730daeda2c743
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 18 20:07:12 2007 +0100

    [cairo-xlib-surface] Match content to xrender_format using the channel masks.
    
    _xrender_format_to_content() was using the channel offset to determine
    whether the format supported a content type.
    For example, the XRenderPictFormat for the A8 format looks like:
        direct.alpha = 0; direct.alphaMask = 0xff;
        direct.red   = 0; direct.redMask   = 0x00;
        direct.green = 0; direct.greenMask = 0x00;
        direct.blue  = 0; direct.blueMask  = 0x00;
    which _xrender_format_to_content() matched as CAIRO_CONTENT_COLOR.
    
    Switch to using the channel masks for deducing content type.

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 56cf0e4..1cf2ce2 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -192,10 +192,10 @@ _xrender_format_to_content (XRenderPictFormat *xrender_format)
     if (xrender_format == NULL)
 	return CAIRO_CONTENT_COLOR;
 
-    xrender_format_has_alpha = (xrender_format->direct.alpha != 0);
-    xrender_format_has_color = (xrender_format->direct.red   != 0 ||
-				xrender_format->direct.green != 0 ||
-				xrender_format->direct.blue  != 0);
+    xrender_format_has_alpha = (xrender_format->direct.alphaMask != 0);
+    xrender_format_has_color = (xrender_format->direct.redMask   != 0 ||
+				xrender_format->direct.greenMask != 0 ||
+				xrender_format->direct.blueMask  != 0);
 
     if (xrender_format_has_alpha)
 	if (xrender_format_has_color)
commit b7d8763c58165817f3238def4d1771ce8575139e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 18 19:42:21 2007 +0100

    [check-plt] Use -W flag to readelf.
    
    Pass -W to readelf so that the output (in particular the function name)
    is not clipped to fit within 80 characters.

diff --git a/src/check-plt.sh b/src/check-plt.sh
index 0fdcf74..da11056 100755
--- a/src/check-plt.sh
+++ b/src/check-plt.sh
@@ -11,7 +11,7 @@ fi
 
 for so in .libs/lib*.so; do
 	echo Checking $so for local PLT entries
-	readelf -r $so | grep 'JU\?MP_SLO' | grep 'cairo' && status=1
+	readelf -W -r $so | grep 'JU\?MP_SLO' | grep 'cairo' && status=1
 done
 
 exit $status
commit 01eb16977359c7953dbabb52e1f6a132d93839f3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 18 19:28:00 2007 +0100

    [test/.gitignore] Add *.exe.so
    
    Ignore these winegcc output files.

diff --git a/test/.gitignore b/test/.gitignore
index d13f1a4..0fc28e8 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -165,6 +165,7 @@ valgrind-log
 *.gcda
 *.gcno
 *.exe
+*.exe.so
 *.obj
 *.ilk
 *.pdb