[cairo] Missing cairo_public/cairo_private

[Christian Biesinger]

Hi,
I noticed that some functions seem to be missing a 
cairo_public/cairo_private annotation. The attached patches add them; 
however, before I check them in - was there a reason why these don't 
have the cairo_public/cairo_private?

Also:
Should cairo_test_xlib_disable_render have a cairo_public annotation too?

-------------- next part --------------
diff-tree a1c72cd8f244e97d4b6fe3e5d3efa622c8b3f7f9 (from ac3762ac3f5480d6c773d6a947d02a1bdad10c28)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Fri Feb 24 00:04:05 2006 +0100

    Mark private functions as cairo_private

diff --git a/src/cairo-paginated-surface-private.h b/src/cairo-paginated-surface-private.h
index 2f91829..79438e4 100644
--- a/src/cairo-paginated-surface-private.h
+++ b/src/cairo-paginated-surface-private.h
@@ -43,11 +43,11 @@ _cairo_paginated_surface_create (cairo_s
 				 cairo_content_t	 content,
 				 int			 width,
 				 int			 height);
 
 cairo_private cairo_surface_t *
 _cairo_paginated_surface_get_target (cairo_surface_t *surface);
 
-cairo_bool_t
+cairo_private cairo_bool_t
 _cairo_surface_is_paginated (cairo_surface_t *surface);
 
 #endif /* CAIRO_PAGINATED_SURFACE_H */
diff --git a/src/cairoint.h b/src/cairoint.h
index 352df1f..04da7da 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -338,15 +338,15 @@ struct _cairo_array {
 
     cairo_bool_t is_snapshot;
 };
 
 cairo_private void
 _cairo_array_init (cairo_array_t *array, int element_size);
 
-void
+cairo_private void
 _cairo_array_init_snapshot (cairo_array_t	*array,
 			    const cairo_array_t *other);
 
 cairo_private void
 _cairo_array_fini (cairo_array_t *array);
 
 cairo_private cairo_status_t
@@ -359,15 +359,15 @@ cairo_private cairo_status_t
 _cairo_array_append (cairo_array_t *array, const void *element);
 
 cairo_private cairo_status_t
 _cairo_array_append_multiple (cairo_array_t	*array,
 			      const void	*elements,
 			      int		 num_elements);
 
-cairo_status_t
+cairo_private cairo_status_t
 _cairo_array_allocate (cairo_array_t	 *array,
 		       int		  num_elements,
 		       void		**elements);
 
 cairo_private void *
 _cairo_array_index (cairo_array_t *array, int index);
 
@@ -1376,21 +1376,21 @@ _cairo_hull_compute (cairo_pen_vertex_t 
 cairo_private void
 _cairo_path_fixed_init (cairo_path_fixed_t *path);
 
 cairo_private cairo_status_t
 _cairo_path_fixed_init_copy (cairo_path_fixed_t *path,
 			     cairo_path_fixed_t *other);
 
-cairo_path_fixed_t *
+cairo_private cairo_path_fixed_t *
 _cairo_path_fixed_create (void);
 
 cairo_private void
 _cairo_path_fixed_fini (cairo_path_fixed_t *path);
 
-void
+cairo_private void
 _cairo_path_fixed_destroy (cairo_path_fixed_t *path);
 
 cairo_private cairo_status_t
 _cairo_path_fixed_move_to (cairo_path_fixed_t  *path,
 			   cairo_fixed_t	x,
 			   cairo_fixed_t	y);
 
@@ -1548,15 +1548,15 @@ _cairo_scaled_glyph_set_surface (cairo_s
 				 cairo_image_surface_t *surface);
 
 cairo_private void
 _cairo_scaled_glyph_set_path (cairo_scaled_glyph_t *scaled_glyph,
 			      cairo_scaled_font_t *scaled_font,
 			      cairo_path_fixed_t *path);
 
-cairo_status_t
+cairo_private cairo_status_t
 _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
 			    unsigned long index,
 			    cairo_scaled_glyph_info_t info,
 			    cairo_scaled_glyph_t **scaled_glyph_ret);
 
 cairo_private void
 _cairo_scaled_font_map_destroy (void);
@@ -1814,15 +1814,15 @@ _cairo_surface_composite_shape_fixup_unb
 
 cairo_private cairo_format_t
 _cairo_format_from_content (cairo_content_t content);
 
 cairo_private cairo_content_t
 _cairo_content_from_format (cairo_format_t format);
 
-cairo_surface_t *
+cairo_private cairo_surface_t *
 _cairo_image_surface_create_for_pixman_image (pixman_image_t *pixman_image,
 					      cairo_format_t  format);
 
 cairo_private cairo_surface_t *
 _cairo_image_surface_create_with_masks (unsigned char	       *data,
 					cairo_format_masks_t   *format,
 					int			width,
@@ -2065,15 +2065,15 @@ _cairo_pattern_acquire_surfaces (cairo_p
 				 unsigned int		    width,
 				 unsigned int		    height,
 				 cairo_surface_t	    **src_out,
 				 cairo_surface_t	    **mask_out,
 				 cairo_surface_attributes_t *src_attributes,
 				 cairo_surface_attributes_t *mask_attributes);
 
-cairo_status_t
+cairo_private cairo_status_t
 _cairo_pattern_get_extents (cairo_pattern_t	*pattern,
 			    cairo_rectangle_t	*extents);
 
 cairo_private cairo_status_t
 _cairo_gstate_set_antialias (cairo_gstate_t *gstate,
 			     cairo_antialias_t antialias);
 
-------------- next part --------------
diff-tree ac3762ac3f5480d6c773d6a947d02a1bdad10c28 (from 060e8d6e6d9def297db35a184a0e0d5398f6a32c)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Fri Feb 24 00:01:48 2006 +0100

    Mark public function as cairo_public

diff --git a/src/cairo-debug.h b/src/cairo-debug.h
index 1dab2c7..148d02b 100644
--- a/src/cairo-debug.h
+++ b/src/cairo-debug.h
@@ -36,13 +36,13 @@
 #ifndef CAIRO_DEBUG_H
 #define CAIRO_DEBUG_H
 
 #include <cairo-features.h>
 
 CAIRO_BEGIN_DECLS
 
-void
+cairo_public void
 cairo_debug_reset_static_data (void);
 
 CAIRO_END_DECLS
 
 #endif /* CAIRO_H */