Attachment 32340 Details for Bug 25814 – [quartz] Define cairo_quartz_float_t and use instead of float

[patch] [quartz] Define cairo_quartz_float_t and use instead of float

0001-quartz-Define-cairo_quartz_float_t-and-use-instead-o.patch (text/plain), 5.39 KB, created by Kristian Rietveld on 2009-12-29 00:08:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Rietveld

Created: 2009-12-29 00:08:55 UTC

Size: 5.39 KB

patch

obsolete

>From 47851c3ab6829a268bae1aa51ebdd1043a80d803 Mon Sep 17 00:00:00 2001
>From: Kristian Rietveld <kris@gtk.org>
>Date: Tue, 29 Dec 2009 08:47:09 +0100
>Subject: [PATCH] [quartz] Define cairo_quartz_float_t and use instead of float
>
>On Mac OS 10.6 and newer cairo_quartz_float_t is defined to be a
>CGFloat, resolving issues with the 64-bit builds.
>---
> src/cairo-quartz-private.h |    6 ++++++
> src/cairo-quartz-surface.c |   38 ++++++++++++++++++++------------------
> 2 files changed, 26 insertions(+), 18 deletions(-)
>
>diff --git a/src/cairo-quartz-private.h b/src/cairo-quartz-private.h
>index d7e07ac..30abe52 100644
>--- a/src/cairo-quartz-private.h
>+++ b/src/cairo-quartz-private.h
>@@ -44,6 +44,12 @@
> #include "cairo-quartz.h"
> #include "cairo-surface-clipper-private.h"
> 
>+#ifdef CGFLOAT_DEFINED
>+typedef CGFloat cairo_quartz_float_t;
>+#else
>+typedef float cairo_quartz_float_t;
>+#endif
>+
> typedef struct cairo_quartz_surface {
>     cairo_surface_t base;
> 
>diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
>index 44b25a3..67b1972 100644
>--- a/src/cairo-quartz-surface.c
>+++ b/src/cairo-quartz-surface.c
>@@ -748,7 +748,9 @@ _cairo_quartz_fixup_unbounded_operation (cairo_quartz_surface_t *surface,
>  */
> 
> static void
>-ComputeGradientValue (void *info, const float *in, float *out)
>+ComputeGradientValue (void *info,
>+                      const cairo_quartz_float_t *in,
>+                      cairo_quartz_float_t *out)
> {
>     double fdist = *in;
>     const cairo_gradient_pattern_t *grad = (cairo_gradient_pattern_t*) info;
>@@ -779,10 +781,10 @@ ComputeGradientValue (void *info, const float *in, float *out)
> 	out[2] = grad->stops[i].color.blue;
> 	out[3] = grad->stops[i].color.alpha;
>     } else {
>-	float ax = grad->stops[i-1].offset;
>-	float bx = grad->stops[i].offset - ax;
>-	float bp = (fdist - ax)/bx;
>-	float ap = 1.0 - bp;
>+	cairo_quartz_float_t ax = grad->stops[i-1].offset;
>+	cairo_quartz_float_t bx = grad->stops[i].offset - ax;
>+	cairo_quartz_float_t bp = (fdist - ax)/bx;
>+	cairo_quartz_float_t ap = 1.0 - bp;
> 
> 	out[0] =
> 	    grad->stops[i-1].color.red * ap +
>@@ -803,8 +805,8 @@ static CGFunctionRef
> CreateGradientFunction (const cairo_gradient_pattern_t *gpat)
> {
>     cairo_pattern_t *pat;
>-    float input_value_range[2] = { 0.f, 1.f };
>-    float output_value_ranges[8] = { 0.f, 1.f, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f };
>+    cairo_quartz_float_t input_value_range[2] = { 0.f, 1.f };
>+    cairo_quartz_float_t output_value_ranges[8] = { 0.f, 1.f, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f };
>     CGFunctionCallbacks callbacks = {
> 	0, ComputeGradientValue, (CGFunctionReleaseInfoCallback) cairo_pattern_destroy
>     };
>@@ -829,8 +831,8 @@ CreateRepeatingGradientFunction (cairo_quartz_surface_t *surface,
> 				 CGAffineTransform matrix)
> {
>     cairo_pattern_t *pat;
>-    float input_value_range[2];
>-    float output_value_ranges[8] = { 0.f, 1.f, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f };
>+    cairo_quartz_float_t input_value_range[2];
>+    cairo_quartz_float_t output_value_ranges[8] = { 0.f, 1.f, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f };
>     CGFunctionCallbacks callbacks = {
> 	0, ComputeGradientValue, (CGFunctionReleaseInfoCallback) cairo_pattern_destroy
>     };
>@@ -1050,7 +1052,7 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t
> 			      SurfacePatternDrawFunc,
> 			      SurfacePatternReleaseInfoFunc };
>     SurfacePatternDrawInfo *info;
>-    float rw, rh;
>+    cairo_quartz_float_t rw, rh;
>     cairo_status_t status;
>     cairo_bool_t is_bounded;
> 
>@@ -1429,7 +1431,7 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface,
>     }
> 
>     if (source->type == CAIRO_PATTERN_TYPE_SURFACE) {
>-	float patternAlpha = 1.0f;
>+	cairo_quartz_float_t patternAlpha = 1.0f;
> 	CGColorSpaceRef patternSpace;
> 	CGPatternRef pattern;
> 	cairo_int_status_t status;
>@@ -2039,20 +2041,20 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
> 
>     if (style->dash && style->num_dashes) {
> #define STATIC_DASH 32
>-	float sdash[STATIC_DASH];
>-	float *fdash = sdash;
>+	cairo_quartz_float_t sdash[STATIC_DASH];
>+	cairo_quartz_float_t *fdash = sdash;
> 	unsigned int max_dashes = style->num_dashes;
> 	unsigned int k;
> 
> 	if (style->num_dashes%2)
> 	    max_dashes *= 2;
> 	if (max_dashes > STATIC_DASH)
>-	    fdash = _cairo_malloc_ab (max_dashes, sizeof (float));
>+	    fdash = _cairo_malloc_ab (max_dashes, sizeof (cairo_quartz_float_t));
> 	if (fdash == NULL)
> 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
> 
> 	for (k = 0; k < max_dashes; k++)
>-	    fdash[k] = (float) style->dash[k % style->num_dashes];
>+	    fdash[k] = (cairo_quartz_float_t) style->dash[k % style->num_dashes];
> 
> 	CGContextSetLineDash (surface->cgContext, style->dash_offset, fdash, max_dashes);
> 	if (fdash != sdash)
>@@ -2147,7 +2149,7 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
>     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
>     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
>     cairo_quartz_action_t action;
>-    float xprev, yprev;
>+    cairo_quartz_float_t xprev, yprev;
>     int i;
>     CGFontRef cgfref = NULL;
> 
>@@ -2250,8 +2252,8 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
>     cg_glyphs[0] = glyphs[0].index;
> 
>     for (i = 1; i < num_glyphs; i++) {
>-	float xf = glyphs[i].x;
>-	float yf = glyphs[i].y;
>+	cairo_quartz_float_t xf = glyphs[i].x;
>+	cairo_quartz_float_t yf = glyphs[i].y;
> 	cg_glyphs[i] = glyphs[i].index;
> 	cg_advances[i-1].width = xf - xprev;
> 	cg_advances[i-1].height = yf - yprev;
>-- 
>1.6.4.4
>

Actions: View | Splinter Review

Attachments on bug 25814: 32340

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.