[cairo-commit] cairo/src cairo-path-data-private.h, 1.7, 1.8 cairo-path-data.c, 1.9, 1.10 cairo.c, 1.119, 1.120

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv7292/src

Modified Files:
	cairo-path-data-private.h cairo-path-data.c cairo.c 
Log Message:

2005-08-05  Carl Worth  <cworth at cworth.org>

        * doc/public/cairo-sections.txt: Add some missing declarations to
        the appropriate sections.

        * doc/public/tmpl/cairo-font.sgml:
        * doc/public/tmpl/cairo-surface.sgml:
        * doc/public/tmpl/cairo-xlib.sgml:
        * doc/public/tmpl/cairo.sgml: churn

        * src/cairo-path-data-private.h: Rename cairo_path_nil to
        _cairo_path_nil since it may be exported, and tag it cairo_private
        to try to avoid exporting it. Qualify it as const well.

        * src/cairo-path-data.c: (_cairo_path_data_create_real):
        * src/cairo.c: (cairo_copy_path), (cairo_copy_path_flat):
        Track new name of _cairo_path_nil and cast away the const as
        required.


Index: cairo-path-data-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-path-data-private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo-path-data-private.h	28 Jul 2005 16:46:38 -0000	1.7
+++ cairo-path-data-private.h	5 Aug 2005 17:30:31 -0000	1.8
@@ -38,7 +38,7 @@
 
 #include "cairoint.h"
 
-extern cairo_path_t cairo_path_nil;
+cairo_private const cairo_path_t _cairo_path_nil;
 
 cairo_private cairo_path_t *
 _cairo_path_data_create (cairo_path_fixed_t *path,

Index: cairo-path-data.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-path-data.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairo-path-data.c	28 Jul 2005 16:46:38 -0000	1.9
+++ cairo-path-data.c	5 Aug 2005 17:30:31 -0000	1.10
@@ -37,7 +37,7 @@
 #include "cairo-path-fixed-private.h"
 #include "cairo-gstate-private.h"
 
-cairo_path_t cairo_path_nil = { CAIRO_STATUS_NO_MEMORY, NULL, 0 };
+const cairo_path_t _cairo_path_nil = { CAIRO_STATUS_NO_MEMORY, NULL, 0 };
 
 /* Closure for path interpretation. */
 typedef struct cairo_path_data_count {
@@ -346,7 +346,7 @@
 
     path = malloc (sizeof (cairo_path_t));
     if (path == NULL)
-	return &cairo_path_nil;
+	return (cairo_path_t*) &_cairo_path_nil;
 
     path->num_data = _cairo_path_data_count (path, path_fixed,
 					     gstate->tolerance, flatten);
@@ -354,7 +354,7 @@
     path->data = malloc (path->num_data * sizeof (cairo_path_data_t));
     if (path->data == NULL) {
 	free (path);
-	return &cairo_path_nil;
+	return (cairo_path_t*) &_cairo_path_nil;
     }
 
     path->status = CAIRO_STATUS_SUCCESS;
@@ -382,7 +382,7 @@
 void
 cairo_path_destroy (cairo_path_t *path)
 {
-    if (path == NULL || path == &cairo_path_nil)
+    if (path == NULL || path == &_cairo_path_nil)
 	return;
 
     free (path->data);

Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- cairo.c	5 Aug 2005 17:05:29 -0000	1.119
+++ cairo.c	5 Aug 2005 17:30:31 -0000	1.120
@@ -2261,7 +2261,7 @@
 cairo_copy_path (cairo_t *cr)
 {
     if (cr->status)
-	return &cairo_path_nil;
+	return (cairo_path_t*) &_cairo_path_nil;
 
     return _cairo_path_data_create (&cr->path, cr->gstate);
 }
@@ -2300,7 +2300,7 @@
 cairo_copy_path_flat (cairo_t *cr)
 {
     if (cr->status)
-	return &cairo_path_nil;
+	return (cairo_path_t*) &_cairo_path_nil;
     else
 	return _cairo_path_data_create_flat (&cr->path, cr->gstate);
 }