From 92e09ee72fdde9059300b2b63d87e2bbd4286605 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@dustbite.net>
Date: Thu, 9 Mar 2006 08:23:43 -0800
Subject: [PATCH] Complete the CAIRO_PATTERN_TYPE renaming

This fixes compilation of the glitz backend, and also fixes missing
renames in win32, atsui, and directfb backends.
---
 src/cairo-atsui-font.c       |  2 +-
 src/cairo-directfb-surface.c |  6 +++---
 src/cairo-glitz-surface.c    | 14 +++++++-------
 src/cairo-win32-surface.c    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
index a4c2dc2ad..cab7843a4 100644
--- a/src/cairo-atsui-font.c
+++ b/src/cairo-atsui-font.c
@@ -602,7 +602,7 @@ _cairo_atsui_font_old_show_glyphs (void		       *abstract_font,
     CGContextSetFontSize(myBitmapContext, 1.0);
     CGContextSetTextMatrix(myBitmapContext, textTransform);
 
-    if (pattern->type == CAIRO_PATTERN_SOLID &&
+    if (pattern->type == CAIRO_PATTERN_TYPE_SOLID &&
 	_cairo_pattern_is_opaque_solid(pattern))
     {
 	cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *)pattern;
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index 4c3e9cd71..fcd5dd781 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -483,9 +483,9 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
 	if( _dfb_set_operator(op,surface->buffer) == DFB_UNSUPPORTED ) 
 		return CAIRO_INT_STATUS_UNSUPPORTED;
 
-    if (src_pattern->type == CAIRO_PATTERN_SOLID ) { 
+    if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID ) { 
 
-    } else if (src_pattern->type != CAIRO_PATTERN_SURFACE ||
+    } else if (src_pattern->type != CAIRO_PATTERN_TYPE_SURFACE ||
 			src_pattern->extend != CAIRO_EXTEND_NONE) {
 		return CAIRO_INT_STATUS_UNSUPPORTED;
 	}
@@ -494,7 +494,7 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
 	/* FIXME: When we fully support RENDER style 4-channel
 	 * masks we need to check r/g/b != 1.0.
 	 */
-	if (mask_pattern->type != CAIRO_PATTERN_SOLID)
+	if (mask_pattern->type != CAIRO_PATTERN_TYPE_SOLID)
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 
 		alpha = ((cairo_solid_pattern_t *)mask_pattern)->color.alpha_short >> 8;
diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c
index 667e231d5..c000917ac 100644
--- a/src/cairo-glitz-surface.c
+++ b/src/cairo-glitz-surface.c
@@ -551,8 +551,8 @@ _cairo_glitz_pattern_acquire_surface (cairo_pattern_t	              *pattern,
     attr->acquired = FALSE;
 
     switch (pattern->type) {
-    case CAIRO_PATTERN_LINEAR:
-    case CAIRO_PATTERN_RADIAL: {
+    case CAIRO_PATTERN_TYPE_LINEAR:
+    case CAIRO_PATTERN_TYPE_RADIAL: {
 	cairo_gradient_pattern_t    *gradient =
 	    (cairo_gradient_pattern_t *) pattern;
 	char			    *data;
@@ -587,7 +587,7 @@ _cairo_glitz_pattern_acquire_surface (cairo_pattern_t	              *pattern,
 	if (!CAIRO_GLITZ_FEATURE_OK (dst->surface, FRAGMENT_PROGRAM))
 	    break;
 
-	if (pattern->type == CAIRO_PATTERN_RADIAL)
+	if (pattern->type == CAIRO_PATTERN_TYPE_RADIAL)
 	    n_base_params = 6;
 	else
 	    n_base_params = 4;
@@ -639,7 +639,7 @@ _cairo_glitz_pattern_acquire_surface (cairo_pattern_t	              *pattern,
 
 	glitz_buffer_destroy (buffer);
 
-	if (pattern->type == CAIRO_PATTERN_LINEAR)
+	if (pattern->type == CAIRO_PATTERN_TYPE_LINEAR)
 	{
 	    cairo_linear_pattern_t *grad = (cairo_linear_pattern_t *) pattern;
 
@@ -776,8 +776,8 @@ _cairo_glitz_pattern_acquire_surfaces (cairo_pattern_t	                *src,
      * information in mask, so this will need to change when we
      * support RENDER-style 4-channel masks. */
 
-    if (src->type == CAIRO_PATTERN_SOLID &&
-	mask->type == CAIRO_PATTERN_SOLID)
+    if (src->type == CAIRO_PATTERN_TYPE_SOLID &&
+	mask->type == CAIRO_PATTERN_TYPE_SOLID)
     {
 	cairo_color_t combined;
 	cairo_solid_pattern_t *src_solid = (cairo_solid_pattern_t *) src;
@@ -1018,7 +1018,7 @@ _cairo_glitz_surface_composite_trapezoids (cairo_operator_t  op,
     if (_glitz_ensure_target (dst->surface))
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
-    if (pattern->type == CAIRO_PATTERN_SURFACE)
+    if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE)
     {
 	_cairo_pattern_init_copy (&tmp_src_pattern.base, pattern);
 
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 5e1e34203..3e88ec55e 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -631,7 +631,7 @@ _cairo_win32_surface_composite (cairo_operator_t	op,
     int integer_transform;
     int itx, ity;
 
-    if (pattern->type != CAIRO_PATTERN_SURFACE ||
+    if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE ||
 	pattern->extend != CAIRO_EXTEND_NONE)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
@@ -639,7 +639,7 @@ _cairo_win32_surface_composite (cairo_operator_t	op,
 	/* FIXME: When we fully support RENDER style 4-channel
 	 * masks we need to check r/g/b != 1.0.
 	 */
-	if (mask_pattern->type != CAIRO_PATTERN_SOLID)
+	if (mask_pattern->type != CAIRO_PATTERN_TYPE_SOLID)
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 
 	alpha = ((cairo_solid_pattern_t *)mask_pattern)->color.alpha_short >> 8;