fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-25 09:40:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some missing declarations to the appropriate sections.

Browse source 
churn
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.
Track new name of _cairo_path_nil and cast away the const as required.
This commit is contained in:
Carl Worth 2005-08-05 10:30:31 +00:00
parent a2dc18fd0c
commit 59d7f60249
9 changed files with 76 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,3 +1,22 @@
2005-08-05 Carl Worth <cworth@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.
2005-08-05 Carl Worth <cworth@cworth.org>
* src/cairo-arc.c:

5
doc/public/cairo-sections.txt
View file

@ -75,6 +75,7 @@ cairo_xcb_surface_create_with_xrender_format
cairo_xlib_surface_create
cairo_xlib_surface_create_for_bitmap
cairo_xlib_surface_set_size
cairo_xlib_surface_set_drawable
</SECTION>
<SECTION>
@ -90,6 +91,7 @@ cairo_surface_t
cairo_surface_create_similar
cairo_surface_reference
cairo_surface_destroy
cairo_surface_status
cairo_surface_finish
cairo_surface_get_font_options
cairo_surface_set_user_data
@ -148,11 +150,13 @@ cairo_font_face_t
cairo_scaled_font_t
cairo_font_face_reference
cairo_font_face_destroy
cairo_font_face_status
cairo_font_face_get_user_data
cairo_font_face_set_user_data
cairo_scaled_font_create
cairo_scaled_font_reference
cairo_scaled_font_destroy
cairo_scaled_font_status
cairo_font_extents_t
cairo_scaled_font_extents
cairo_text_extents_t
@ -296,6 +300,7 @@ cairo_destroy_func_t
cairo_user_data_key_t
cairo_read_func_t
cairo_write_func_t
cairo_debug_reset_static_data
<SUBSECTION Private>
CAIRO_BEGIN_DECLS
CAIRO_END_DECLS

18
doc/public/tmpl/cairo-font.sgml
View file

@ -46,6 +46,15 @@ Font Handling
@font_face:
<!-- ##### FUNCTION cairo_font_face_status ##### -->
<para>
</para>
@font_face:
@Returns:
<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
<para>
@ -97,6 +106,15 @@ Font Handling
@scaled_font:
<!-- ##### FUNCTION cairo_scaled_font_status ##### -->
<para>
</para>
@scaled_font:
@Returns:
<!-- ##### STRUCT cairo_font_extents_t ##### -->
<para>

9
doc/public/tmpl/cairo-surface.sgml
View file

@ -54,6 +54,15 @@ cairo_surface_t
@surface:
<!-- ##### FUNCTION cairo_surface_status ##### -->
<para>
</para>
@surface:
@Returns:
<!-- ##### FUNCTION cairo_surface_finish ##### -->
<para>

11
doc/public/tmpl/cairo-xlib.sgml
View file

@ -53,3 +53,14 @@ XLib Backend
@height:
<!-- ##### FUNCTION cairo_xlib_surface_set_drawable ##### -->
<para>
</para>
@surface:
@drawable:
@width:
@height:

7
doc/public/tmpl/cairo.sgml
View file

@ -1116,3 +1116,10 @@ Drawing contexts.
@Returns:
<!-- ##### FUNCTION cairo_debug_reset_static_data ##### -->
<para>
</para>

2
src/cairo-path-data-private.h
View file

@ -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,

8
src/cairo-path-data.c
View file

@ -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 @@ _cairo_path_data_create_real (cairo_path_fixed_t *path_fixed,
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 @@ _cairo_path_data_create_real (cairo_path_fixed_t *path_fixed,
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 @@ _cairo_path_data_create_real (cairo_path_fixed_t *path_fixed,
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);

4
src/cairo.c
View file

@ -2261,7 +2261,7 @@ cairo_path_t *
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_path_t *
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);
}