From 7aba47e9d87bf09a5fa7e41a3c76c775f28b08f3 Mon Sep 17 00:00:00 2001
From: Andrea Canciani <ranma42@gmail.com>
Date: Mon, 25 Jan 2010 15:09:51 +0100
Subject: [PATCH] [quartz] Silence compiler warnings

---
 src/cairo-quartz-surface.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index bbfff37b3..a7a94b454 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -182,14 +182,14 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
     CGImageRef image = NULL;
     CGDataProviderRef dataProvider = NULL;
     CGColorSpaceRef colorSpace = colorSpaceOverride;
-    CGBitmapInfo bitinfo;
+    CGBitmapInfo bitinfo = kCGBitmapByteOrder32Host;
     int bitsPerComponent, bitsPerPixel;
 
     switch (format) {
 	case CAIRO_FORMAT_ARGB32:
 	    if (colorSpace == NULL)
 		colorSpace = CGColorSpaceCreateDeviceRGB();
-	    bitinfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host;
+	    bitinfo |= kCGImageAlphaPremultipliedFirst;
 	    bitsPerComponent = 8;
 	    bitsPerPixel = 32;
 	    break;
@@ -197,7 +197,7 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
 	case CAIRO_FORMAT_RGB24:
 	    if (colorSpace == NULL)
 		colorSpace = CGColorSpaceCreateDeviceRGB();
-	    bitinfo = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host;
+	    bitinfo |= kCGImageAlphaNoneSkipFirst;
 	    bitsPerComponent = 8;
 	    bitsPerPixel = 32;
 	    break;
@@ -302,7 +302,7 @@ _cairo_quartz_verify_surface_size(int width, int height)
 
 typedef struct _quartz_stroke {
     CGContextRef cgContext;
-    cairo_matrix_t *ctm_inverse;
+    const cairo_matrix_t *ctm_inverse;
 } quartz_stroke_t;
 
 /* cairo path -> execute in context */
@@ -864,8 +864,8 @@ CreateRepeatingGradientFunction (cairo_quartz_surface_t *surface,
     dy = fabs (mend.y - mstart.y);
 
     if (dx > 1e-6) {
-	x_rep_start = (int) ceil(MIN(mstart.x, mend.x) / dx);
-	x_rep_end = (int) ceil((surface->extents.width - MAX(mstart.x, mend.x)) / dx);
+	x_rep_start = ceil(MIN(mstart.x, mend.x) / dx);
+	x_rep_end = ceil((surface->extents.width - MAX(mstart.x, mend.x)) / dx);
 
 	if (mend.x < mstart.x) {
 	    int swap = x_rep_end;
@@ -875,8 +875,8 @@ CreateRepeatingGradientFunction (cairo_quartz_surface_t *surface,
     }
 
     if (dy > 1e-6) {
-	y_rep_start = (int) ceil(MIN(mstart.y, mend.y) / dy);
-	y_rep_end = (int) ceil((surface->extents.width - MAX(mstart.y, mend.y)) / dy);
+	y_rep_start = ceil(MIN(mstart.y, mend.y) / dy);
+	y_rep_end = ceil((surface->extents.width - MAX(mstart.y, mend.y)) / dy);
 
 	if (mend.y < mstart.y) {
 	    int swap = y_rep_end;