Attachment 3866 Details for Bug 5082 – cairo-user-data.patch

[patch] cairo-user-data.patch

cairo-user-data.patch (text/plain), 7.75 KB, created by Vladimir Vukicevic on 2005-11-22 09:33:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Vukicevic

Created: 2005-11-22 09:33:25 UTC

Size: 7.75 KB

patch

obsolete

>? cairo-user-data.patch
>? extents-with-op.diff
>? xlib-copyarea.patch
>? src/cairo-quartz2-surface.c
>? src/cairo-quartz2.h
>? test/canvas-brick.png
>? test/canvas1
>? test/canvas1.c
>? test/foo
>? test/s
>Index: pixman/src/pixman-xserver-compat.h
>===================================================================
>RCS file: /cvs/cairo/cairo/pixman/src/pixman-xserver-compat.h,v
>retrieving revision 1.8
>diff -u -8 -p -r1.8 pixman-xserver-compat.h
>--- pixman/src/pixman-xserver-compat.h	11 Aug 2005 04:10:13 -0000	1.8
>+++ pixman/src/pixman-xserver-compat.h	21 Nov 2005 22:32:15 -0000
>@@ -67,18 +67,18 @@ typedef pixman_line_fixed_t	xLineFixed;
> typedef pixman_trapezoid_t	xTrapezoid;
> typedef pixman_triangle_t	xTriangle;
> */
> #define RENDER 1
> /*
> #define FB_SHIFT IC_SHIFT 
> #define FB_MASK IC_MASK
> #define FB_ALLONES IC_ALLONES
>+#define FbMaskBits IcMaskBits
> */
>-//#define FbMaskBits IcMaskBits
> 
> /* XXX: We changed some function and field names which makes for some
>  * ugly hacks... */
> #define pDrawable pixels
> #define fbGetDrawable(pDrawable, buf, outstride, outbpp, xoff, yoff) { \
>     (buf) = (pDrawable)->data; \
>     (outstride) = ((int) pDrawable->stride) / sizeof (pixman_bits_t); \
>     (outbpp) = (pDrawable)->bpp; \
>Index: pixman/src/pixregion.c
>===================================================================
>RCS file: /cvs/cairo/cairo/pixman/src/pixregion.c,v
>retrieving revision 1.11
>diff -u -8 -p -r1.11 pixregion.c
>--- pixman/src/pixregion.c	22 Aug 2005 19:15:28 -0000	1.11
>+++ pixman/src/pixregion.c	21 Nov 2005 22:32:15 -0000
>@@ -55,17 +55,17 @@ SOFTWARE.
> 
> #if defined (__GNUC__) && !defined (NO_INLINES)
> #define INLINE	__inline
> #else
> #define INLINE
> #endif
> 
> #undef assert
>-#ifdef DEBUG
>+#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(pixman_region16_valid(reg))
>@@ -203,17 +203,17 @@ if (((numRects) < ((reg)->data->size >> 
>     if (NewData)							 \
>     {									 \
> 	NewData->size = (numRects);					 \
> 	(reg)->data = NewData;						 \
>     }									 \
> }
> 
> 
>-#ifdef DEBUG
>+#ifdef DEBUG_PIXREGION
> int
> pixman_region16_print(rgn)
>     pixman_region16_t * rgn;
> {
>     int num, size;
>     int i;
>     pixman_box16_t * rects;
> 
>@@ -297,17 +297,17 @@ pixman_region16_valid(reg)
> 	}
> 	return ((box.x1 == reg->extents.x1) &&
> 		(box.x2 == reg->extents.x2) &&
> 		(box.y1 == reg->extents.y1) &&
> 		(box.y2 == reg->extents.y2));
>     }
> }
> 
>-#endif /* DEBUG */
>+#endif /* DEBUG_PIXREGION */
> 
> 
> /*	Create a new empty region	*/
> pixman_region16_t *
> pixman_region_create (void)
> {
>     return pixman_region_create_simple (NULL);
> }
>Index: src/cairo-private.h
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo-private.h,v
>retrieving revision 1.4
>diff -u -8 -p -r1.4 cairo-private.h
>--- src/cairo-private.h	20 Jun 2005 16:59:23 -0000	1.4
>+++ src/cairo-private.h	21 Nov 2005 22:32:15 -0000
>@@ -42,11 +42,13 @@
> struct _cairo {
>     unsigned int ref_count;
> 
>     cairo_status_t status;
> 
>     cairo_path_fixed_t path;
> 
>     cairo_gstate_t *gstate;
>+
>+    cairo_user_data_array user_data;
> };
> 
> #endif /* CAIRO_PRIVATE_H */
>Index: src/cairo.c
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo.c,v
>retrieving revision 1.137
>diff -u -8 -p -r1.137 cairo.c
>--- src/cairo.c	10 Oct 2005 16:16:21 -0000	1.137
>+++ src/cairo.c	21 Nov 2005 22:32:15 -0000
>@@ -48,17 +48,18 @@ static const cairo_t cairo_nil = {
>   CAIRO_STATUS_NO_MEMORY,	/* status */
>   { 				/* path */
>     NULL, NULL,			/* op_buf_head, op_buf_tail */
>     NULL, NULL,			/* arg_buf_head, arg_buf_tail */
>     { 0, 0 },			/* last_move_point */
>     { 0, 0 },			/* current point */
>     FALSE,			/* has_current_point */
>   },
>-  NULL				/* gstate */
>+  NULL,				/* gstate */
>+  { 0, 0, 0, NULL }		/* user_data */
> };
> 
> #include <assert.h>
> 
> /* This has to be updated whenever cairo_status_t is extended.  That's
>  * a bit of a pain, but it should be easy to always catch as long as
>  * one adds a new test case to test a trigger of the new status value.
>  */
>@@ -199,16 +200,18 @@ cairo_create (cairo_surface_t *target)
> 	_cairo_set_error (cr, CAIRO_STATUS_NULL_POINTER);
> 	return cr;
>     }
> 
>     cr->gstate = _cairo_gstate_create (target);
>     if (cr->gstate == NULL)
> 	_cairo_set_error (cr, CAIRO_STATUS_NO_MEMORY);
> 
>+    _cairo_user_data_array_init (&cr->user_data);
>+
>     return cr;
> }
> 
> /**
>  * cairo_reference:
>  * @cr: a #cairo_t
>  * 
>  * Increases the reference count on @cr by one. This prevents
>@@ -254,16 +257,18 @@ cairo_destroy (cairo_t *cr)
> 	cairo_gstate_t *tmp = cr->gstate;
> 	cr->gstate = tmp->next;
> 
> 	_cairo_gstate_destroy (tmp);
>     }
> 
>     _cairo_path_fixed_fini (&cr->path);
> 
>+    _cairo_user_data_array_fini (&cr->user_data);
>+
>     free (cr);
> }
> 
> /**
>  * cairo_save:
>  * @cr: a #cairo_t
>  * 
>  * Makes a copy of the current state of @cr and saves it
>@@ -2594,8 +2599,57 @@ cairo_status_to_string (cairo_status_t s
> void
> _cairo_restrict_value (double *value, double min, double max)
> {
>     if (*value < min)
> 	*value = min;
>     else if (*value > max)
> 	*value = max;
> }
>+
>+/**
>+ * cairo_get_user_data
>+ * @cr: a #cairo_t
>+ * @key: the address of the #cairo_user_data_key_t the user data was
>+ * attached to
>+ * 
>+ * Return user data previously attached to @cr using the specified
>+ * key.  If no user data has been attached with the given key this
>+ * function returns %NULL.
>+ * 
>+ * Return value: the user data previously attached or %NULL.
>+ **/
>+void *
>+cairo_get_user_data (cairo_t			 *cr,
>+                     const cairo_user_data_key_t *key)
>+{
>+    return _cairo_user_data_array_get_data (&cr->user_data,
>+                                            key);
>+}
>+
>+/**
>+ * cairo_set_user_data:
>+ * @cr: a #cairo_t
>+ * @key: the address of a #cairo_user_data_key_t to attach the user data to
>+ * @user_data: the user data to attach to the surface
>+ * @destroy: a #cairo_destroy_func_t which will be called when the
>+ * cairo object is destroyed or when new user data is attached using the
>+ * same key.
>+ * 
>+ * Attach user data to @cr.  To remove user data from a cr,
>+ * call this function with the key that was used to set it and %NULL
>+ * for @data.
>+ *
>+ * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY if a
>+ * slot could not be allocated for the user data.
>+ */
>+cairo_status_t
>+cairo_set_user_data (cairo_t			 *cr,
>+                     const cairo_user_data_key_t *key,
>+                     void			 *user_data,
>+                     cairo_destroy_func_t	  destroy)
>+{
>+    if (cr->ref_count == -1)
>+	return CAIRO_STATUS_NO_MEMORY;
>+    
>+    return _cairo_user_data_array_set_data (&cr->user_data,
>+					    key, user_data, destroy);
>+}
>Index: src/cairo.h
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo.h,v
>retrieving revision 1.155
>diff -u -8 -p -r1.155 cairo.h
>--- src/cairo.h	10 Oct 2005 19:45:15 -0000	1.155
>+++ src/cairo.h	21 Nov 2005 22:32:15 -0000
>@@ -975,16 +975,28 @@ cairo_get_target (cairo_t *cr);
> 
> typedef enum _cairo_path_data_type {
>     CAIRO_PATH_MOVE_TO,
>     CAIRO_PATH_LINE_TO,
>     CAIRO_PATH_CURVE_TO,
>     CAIRO_PATH_CLOSE_PATH
> } cairo_path_data_type_t;
> 
>+/* User data */
>+
>+cairo_public void *
>+cairo_get_user_data (cairo_t		         *cr,
>+		     const cairo_user_data_key_t *key);
>+
>+cairo_public cairo_status_t
>+cairo_set_user_data (cairo_t			 *cr,
>+		     const cairo_user_data_key_t *key,
>+		     void			 *user_data,
>+		     cairo_destroy_func_t	  destroy);
>+
> /**
>  * cairo_path_data_t:
>  *
>  * #cairo_path_data_t is used to represent the path data inside a
>  * #cairo_path_t.
>  *
>  * The data structure is designed to try to balance the demands of
>  * efficiency and ease-of-use. A path is represented as an array of

Actions: View | Splinter Review

Attachments on bug 5082: 3866 | 3867

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.