pixman: Branch 'master'

[Carl Worth]

 pixman/pixman-utils.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 3e700366ef82f0ecd28014cf873ffd292ad9cdc5
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Mar 25 19:43:40 2008 -0700

    Eliminate duplicate case values that were breaking the compilation.

diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index d4e4c77..9cba793 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -450,8 +450,12 @@ pixman_format_supported_destination (pixman_format_code_t format)
     case PIXMAN_c8:
     case PIXMAN_g8:
     case PIXMAN_x4a4:
+    /* Collides with PIXMAN_c8
     case PIXMAN_x4c4:
+    */
+    /* Collides with PIXMAN_g8
     case PIXMAN_x4g4:
+    */
     /* 4bpp formats */
     case PIXMAN_a4:
     case PIXMAN_r1g2b1:
@@ -514,8 +518,12 @@ pixman_format_supported_source (pixman_format_code_t format)
     case PIXMAN_c8:
     case PIXMAN_g8:
     case PIXMAN_x4a4:
+    /* Collides with PIXMAN_c8
     case PIXMAN_x4c4:
+    */
+    /* Collides with PIXMAN_g8
     case PIXMAN_x4g4:
+    */
     /* 4bpp formats */
     case PIXMAN_a4:
     case PIXMAN_r1g2b1: