pixman: Branch 'master' - 4 commits

[Søren Sandmann Pedersen]

 pixman/pixman-edge.c   |    2 +-
 pixman/pixman-region.c |   15 +--------------
 pixman/pixman.c        |   12 +++++++-----
 3 files changed, 9 insertions(+), 20 deletions(-)

New commits:
commit eba3be7b7a2b9a8df235af6255b9d8c70d2b8c93
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sun Jul 5 00:35:31 2009 -0400

    Fix forgotten use BITMAP_BIT_ORDER to be ifndef WORDS_BIG_ENDIAN

diff --git a/pixman/pixman-edge.c b/pixman/pixman-edge.c
index f5bfc06..43e9604 100644
--- a/pixman/pixman-edge.c
+++ b/pixman/pixman-edge.c
@@ -68,7 +68,7 @@
 #define N_BITS	4
 #define rasterizeEdges	fbRasterizeEdges4
 
-#if BITMAP_BIT_ORDER == LSBFirst
+#ifndef WORDS_BIG_ENDIAN
 #define Shift4(o)	((o) << 2)
 #else
 #define Shift4(o)	((1-(o)) << 2)
commit 06f5b51fee35727a823bd86294654178cbfac629
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sat Jul 4 22:49:16 2009 -0400

    Return TRUE for the two new formats in pixman_format_supported_source().

diff --git a/pixman/pixman.c b/pixman/pixman.c
index b6139c4..d566972 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -378,6 +378,8 @@ pixman_format_supported_source (pixman_format_code_t format)
     /* 32 bpp formats */
     case PIXMAN_a2b10g10r10:
     case PIXMAN_x2b10g10r10:
+    case PIXMAN_a2r10g10b10:
+    case PIXMAN_x2r10g10b10:
     case PIXMAN_a8r8g8b8:
     case PIXMAN_x8r8g8b8:
     case PIXMAN_a8b8g8r8:
commit b0f220b7f236b5dea30ddc5dec51b73c11120e10
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Jun 29 11:21:33 2009 -0400

    Inlucde pixman-private.h in pixman-region.c
    
    Delete some duplicated macros.

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index d448266..59b8ac2 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -49,6 +49,7 @@ SOFTWARE.
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
+#include "pixman-private.h"
 
 #define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
 /* not a region */
@@ -63,22 +64,8 @@ SOFTWARE.
 #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1)
 
 
-#undef assert
-#ifdef DEBUG_PIXREGION
-#define assert(expr) {if (!(expr)) \
-		FatalError("Assertion failed file %s, line %d: expr\n", \
-			__FILE__, __LINE__); }
-#else
-#define assert(expr)
-#endif
-
 #define good(reg) assert(PREFIX(_selfcheck) (reg))
 
-#undef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#undef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
 static const box_type_t PREFIX(_emptyBox_) = {0, 0, 0, 0};
 static const region_data_type_t PREFIX(_emptyData_) = {0, 0};
 static const region_data_type_t PREFIX(_brokendata_) = {0, 0};
commit f6ef071e2805bcf52473f06cd7171097b4afd926
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Jun 29 11:07:20 2009 -0400

    Rename OptimizedOperatorInfo to optimized_operator_info_t

diff --git a/pixman/pixman.c b/pixman/pixman.c
index 30310c4..b6139c4 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -37,9 +37,9 @@ typedef struct
     pixman_op_t			opSrcDstOpaque;
     pixman_op_t			opSrcOpaque;
     pixman_op_t			opDstOpaque;
-} OptimizedOperatorInfo;
+} optimized_operator_info_t;
 
-static const OptimizedOperatorInfo optimized_operators[] =
+static const optimized_operator_info_t optimized_operators[] =
 {
     /* Input Operator           SRC&DST Opaque          SRC Opaque              DST Opaque      */
     { PIXMAN_OP_OVER,           PIXMAN_OP_SRC,          PIXMAN_OP_SRC,          PIXMAN_OP_OVER },
@@ -58,10 +58,10 @@ static const OptimizedOperatorInfo optimized_operators[] =
 /*
  * Check if the current operator could be optimized
  */
-static const OptimizedOperatorInfo*
+static const optimized_operator_info_t*
 pixman_operator_can_be_optimized(pixman_op_t op)
 {
-    const OptimizedOperatorInfo *info;
+    const optimized_operator_info_t *info;
 
     for (info = optimized_operators; info->op != PIXMAN_OP_NONE; info++)
     {
@@ -80,7 +80,7 @@ pixman_optimize_operator(pixman_op_t op, pixman_image_t *pSrc, pixman_image_t *p
 {
     pixman_bool_t is_source_opaque;
     pixman_bool_t is_dest_opaque;
-    const OptimizedOperatorInfo *info = pixman_operator_can_be_optimized(op);
+    const optimized_operator_info_t *info = pixman_operator_can_be_optimized(op);
 
     if(!info || pMask)
         return op;