WebSVN – Kolibri OS – Diff – /programs/develop/libraries/cairo/src/cairo-type3-glyph-surface.c

 #include "cairo-type3-glyph-surface-private.h"
 #include "cairo-output-stream-private.h"
 #include "cairo-recording-surface-private.h"
+#include "cairo-analysis-surface-private.h"
-#include "cairo-analysis-surface-private.h"
+#include "cairo-default-context-private.h"
+#include "cairo-error-private.h"
-#include "cairo-error-private.h"
+#include "cairo-image-surface-private.h"
 #include "cairo-surface-clipper-private.h"
 static cairo_int_status_t
 _cairo_type3_glyph_surface_paint (void			*abstract_surface,
 				  cairo_operator_t	 op,
 				  const cairo_pattern_t	*source,
-				  cairo_clip_t		*clip)
+				  const cairo_clip_t	*clip)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     const cairo_surface_pattern_t *pattern;
     cairo_image_surface_t *image;
 static cairo_int_status_t
 _cairo_type3_glyph_surface_mask (void			*abstract_surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 const cairo_pattern_t	*mask,
-				 cairo_clip_t		*clip)
+				 const cairo_clip_t	*clip)
+{
     return _cairo_type3_glyph_surface_paint (abstract_surface,
 					     op, mask,
 					     clip);
+}
 static cairo_int_status_t
 _cairo_type3_glyph_surface_stroke (void			*abstract_surface,
 				   cairo_operator_t	 op,
 				   const cairo_pattern_t *source,
-				   cairo_path_fixed_t	*path,
+				   const cairo_path_fixed_t	*path,
 				   const cairo_stroke_style_t	*style,
 				   const cairo_matrix_t	*ctm,
 				   const cairo_matrix_t	*ctm_inverse,
 				   double		 tolerance,
 				   cairo_antialias_t	 antialias,
-				   cairo_clip_t		*clip)
+				   const cairo_clip_t	*clip)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_int_status_t status;
 static cairo_int_status_t
 _cairo_type3_glyph_surface_fill (void			*abstract_surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
-				 cairo_path_fixed_t	*path,
+				 const cairo_path_fixed_t	*path,
 				 cairo_fill_rule_t	 fill_rule,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
-				 cairo_clip_t		*clip)
+				 const cairo_clip_t		*clip)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_int_status_t status;
 					cairo_operator_t      op,
 					const cairo_pattern_t *source,
 					cairo_glyph_t        *glyphs,
 					int		      num_glyphs,
 					cairo_scaled_font_t  *scaled_font,
-					cairo_clip_t	     *clip,
+					const cairo_clip_t     *clip)
-					int		     *remaining_glyphs)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_int_status_t status;
     cairo_scaled_font_t *font;
     cairo_matrix_t new_ctm, invert_y_axis;
     return status;
+}
 static const cairo_surface_backend_t cairo_type3_glyph_surface_backend = {
-    CAIRO_INTERNAL_SURFACE_TYPE_TYPE3_GLYPH,
-    NULL, /* _cairo_type3_glyph_surface_create_similar */
+    CAIRO_INTERNAL_SURFACE_TYPE_TYPE3_GLYPH,
+    _cairo_type3_glyph_surface_finish,
+    _cairo_default_context_create, /* XXX usable through a context? */
+    NULL, /* create similar */
+    NULL, /* create similar image */
+    NULL, /* map to image */
+    NULL, /* unmap image */
-    _cairo_type3_glyph_surface_finish,
+    NULL, /* source */
     NULL, /* acquire_source_image */
-    NULL, /* release_source_image */
-    NULL, /* acquire_dest_image */
-    NULL, /* release_dest_image */
+    NULL, /* release_source_image */
+    NULL, /* snapshot */
-    NULL, /* clone_similar */
-    NULL, /* composite */
+    NULL, /* copy page */
-    NULL, /* fill_rectangles */
-    NULL, /* composite_trapezoids */
-    NULL, /* create_span_renderer */
-    NULL, /* check_span_renderer */
-    NULL, /* cairo_type3_glyph_surface_copy_page */
+    NULL, /* show page */
     NULL, /* _cairo_type3_glyph_surface_show_page */
-    NULL, /* _cairo_type3_glyph_surface_get_extents */
-    NULL, /* old_show_glyphs */
+    NULL, /* _cairo_type3_glyph_surface_get_extents */
+    NULL, /* _cairo_type3_glyph_surface_get_font_options */
     NULL, /* _cairo_type3_glyph_surface_get_font_options */
     NULL, /* flush */
-    NULL, /* mark_dirty_rectangle */
-    NULL, /* scaled_font_fini */
+    NULL, /* mark_dirty_rectangle */
     NULL, /* scaled_glyph_fini */
     _cairo_type3_glyph_surface_paint,
     _cairo_type3_glyph_surface_mask,
     _cairo_type3_glyph_surface_stroke,
+    _cairo_type3_glyph_surface_fill,
-    _cairo_type3_glyph_surface_fill,
+    NULL, /* fill-stroke */
-    _cairo_type3_glyph_surface_show_glyphs,
-    NULL, /* snapshot */
+    _cairo_type3_glyph_surface_show_glyphs,
 };
 static void
 _cairo_type3_glyph_surface_analyze_glyph (void		     *abstract_surface,
 					  unsigned long	      glyph_index)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_scaled_glyph_t *scaled_glyph;
-    cairo_status_t status, status2;
+    cairo_int_status_t status, status2;
     cairo_output_stream_t *null_stream;
     if (unlikely (surface->base.status))
     status = _cairo_scaled_glyph_lookup (surface->scaled_font,
 					 glyph_index,
 					 CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE,
 					 &scaled_glyph);
-    if (_cairo_status_is_error (status))
+    if (_cairo_int_status_is_error (status))
 	goto cleanup;
     if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
-	status = CAIRO_STATUS_SUCCESS;
+	status = CAIRO_INT_STATUS_SUCCESS;
 	goto cleanup;
+    }
     status = _cairo_recording_surface_replay (scaled_glyph->recording_surface,
 					      &surface->base);
     if (unlikely (status))
 	goto cleanup;
     status = _cairo_pdf_operators_flush (&surface->pdf_operators);
     if (status == CAIRO_INT_STATUS_IMAGE_FALLBACK)
-	status = CAIRO_STATUS_SUCCESS;
+	status = CAIRO_INT_STATUS_SUCCESS;
 cleanup:
     _cairo_scaled_font_thaw_cache (surface->scaled_font);
 				       cairo_box_t           *bbox,
 				       double                *width)
+{
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_scaled_glyph_t *scaled_glyph;
-    cairo_status_t status, status2;
+    cairo_int_status_t status, status2;
     double x_advance, y_advance;
     cairo_matrix_t font_matrix_inverse;
     if (unlikely (surface->base.status))
     if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
 	status = _cairo_scaled_glyph_lookup (surface->scaled_font,
 					     glyph_index,
 					     CAIRO_SCALED_GLYPH_INFO_METRICS,
 					     &scaled_glyph);
-	if (status == CAIRO_STATUS_SUCCESS)
+	if (status == CAIRO_INT_STATUS_SUCCESS)
 	    status = CAIRO_INT_STATUS_IMAGE_FALLBACK;
+    }
-    if (_cairo_status_is_error (status)) {
+    if (_cairo_int_status_is_error (status)) {
 	_cairo_scaled_font_thaw_cache (surface->scaled_font);
 	return status;
+    }
     status2 = cairo_matrix_invert (&font_matrix_inverse);
     /* The invertability of font_matrix is tested in
      * pdf_operators_show_glyphs before any glyphs are mapped to the
      * subset. */
-    assert (status2 == CAIRO_STATUS_SUCCESS);
+    assert (status2 == CAIRO_INT_STATUS_SUCCESS);
     cairo_matrix_transform_distance (&font_matrix_inverse, &x_advance, &y_advance);
 				 _cairo_fixed_to_double (bbox->p1.x),
 				 - _cairo_fixed_to_double (bbox->p2.y),
 				 _cairo_fixed_to_double (bbox->p2.x),
 				 - _cairo_fixed_to_double (bbox->p1.y));
-    if (status == CAIRO_STATUS_SUCCESS) {
+    if (status == CAIRO_INT_STATUS_SUCCESS) {
 	cairo_output_stream_t *mem_stream;
 	mem_stream = _cairo_memory_stream_create ();
 	_cairo_output_stream_printf (surface->stream, "q\n");
 	status = _cairo_recording_surface_replay (scaled_glyph->recording_surface,
 						  &surface->base);
 	status2 = _cairo_pdf_operators_flush (&surface->pdf_operators);
-	if (status == CAIRO_STATUS_SUCCESS)
+	if (status == CAIRO_INT_STATUS_SUCCESS)
 	    status = status2;
 	_cairo_output_stream_printf (surface->stream, "Q\n");
 	_cairo_type3_glyph_surface_set_stream (surface, stream);
-	if (status == CAIRO_STATUS_SUCCESS)
+	if (status == CAIRO_INT_STATUS_SUCCESS)
 	    _cairo_memory_stream_copy (mem_stream, stream);
 	status2 = _cairo_output_stream_destroy (mem_stream);
-	if (status == CAIRO_STATUS_SUCCESS)
+	if (status == CAIRO_INT_STATUS_SUCCESS)

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/cairo/src/cairo-type3-glyph-surface.c – Rev 1897 → 3959