[cairo-commit] 2 commits - src/cairoint.h src/cairo-path.c src/cairo-pattern.c test/arc-looping-dash.c

[Uli Schlachter]

 src/cairo-path.c        |    1 +
 src/cairo-pattern.c     |    4 ++++
 src/cairoint.h          |    5 +++++
 test/arc-looping-dash.c |    2 ++
 4 files changed, 12 insertions(+)

New commits:
commit 7ad3aebbe612ef560d4a73f85db226c8e7caa4b2
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Feb 12 20:49:02 2011 +0100

    arc-looping-dash: Add a missing cairo_restore ()
    
    This test called cairo_save () without restoring again. Normally, this doesn't
    cause a problem. However, when cairo-test-suite is called with "-a", it also
    executes the tests on a similar surface. This then caused
    cairo_pop_group_to_source to be called on a cairo_save state which causes a
    CAIRO_STATUS_INVALID_RESTORE since commit 5d95ae924ed1520.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/test/arc-looping-dash.c b/test/arc-looping-dash.c
index 2ad55f6..ff5556a 100644
--- a/test/arc-looping-dash.c
+++ b/test/arc-looping-dash.c
@@ -66,6 +66,8 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_dash (cr, dashes, 2, 0);
     cairo_stroke (cr);
 
+    cairo_restore (cr);
+
     return CAIRO_TEST_SUCCESS;
 }
 
commit 788bdec628ca004a73446414961f74e2443a8b06
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Feb 12 14:51:30 2011 +0100

    Fix errors from src/check-plt.sh
    
    All of these symbols are used in cairo-script-surface.c for emitting mesh
    patterns.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-path.c b/src/cairo-path.c
index d9f08ac..bc5b731 100644
--- a/src/cairo-path.c
+++ b/src/cairo-path.c
@@ -372,6 +372,7 @@ cairo_path_destroy (cairo_path_t *path)
 
     free (path);
 }
+slim_hidden_def (cairo_path_destroy);
 
 /**
  * _cairo_path_create:
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 630edc2..000b1ee 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -4910,6 +4910,7 @@ cairo_mesh_pattern_get_patch_count (cairo_pattern_t *pattern,
 
     return CAIRO_STATUS_SUCCESS;
 }
+slim_hidden_def (cairo_mesh_pattern_get_patch_count);
 
 /**
  * cairo_mesh_pattern_get_path
@@ -4997,6 +4998,7 @@ cairo_mesh_pattern_get_path (cairo_pattern_t *pattern,
 
     return path;
 }
+slim_hidden_def (cairo_mesh_pattern_get_path);
 
 /**
  * cairo_mesh_pattern_get_corner_color_rgba
@@ -5064,6 +5066,7 @@ cairo_mesh_pattern_get_corner_color_rgba (cairo_pattern_t *pattern,
 
     return CAIRO_STATUS_SUCCESS;
 }
+slim_hidden_def (cairo_mesh_pattern_get_corner_color_rgba);
 
 /**
  * cairo_mesh_pattern_get_control_point
@@ -5128,6 +5131,7 @@ cairo_mesh_pattern_get_control_point (cairo_pattern_t *pattern,
 
     return CAIRO_STATUS_SUCCESS;
 }
+slim_hidden_def (cairo_mesh_pattern_get_control_point);
 
 void
 _cairo_pattern_reset_static_data (void)
diff --git a/src/cairoint.h b/src/cairoint.h
index 74f80d3..1aaca2a 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -2437,6 +2437,10 @@ slim_hidden_proto (cairo_pattern_create_rgba);
 slim_hidden_proto (cairo_pattern_destroy);
 slim_hidden_proto (cairo_pattern_get_extend);
 slim_hidden_proto (cairo_mesh_pattern_curve_to);
+slim_hidden_proto (cairo_mesh_pattern_get_control_point);
+slim_hidden_proto (cairo_mesh_pattern_get_corner_color_rgba);
+slim_hidden_proto (cairo_mesh_pattern_get_patch_count);
+slim_hidden_proto (cairo_mesh_pattern_get_path);
 slim_hidden_proto (cairo_mesh_pattern_line_to);
 slim_hidden_proto (cairo_mesh_pattern_move_to);
 slim_hidden_proto (cairo_mesh_pattern_set_corner_color_rgba);
@@ -2444,6 +2448,7 @@ slim_hidden_proto_no_warn (cairo_pattern_reference);
 slim_hidden_proto (cairo_pattern_set_matrix);
 slim_hidden_proto (cairo_pop_group);
 slim_hidden_proto (cairo_push_group_with_content);
+slim_hidden_proto_no_warn (cairo_path_destroy);
 slim_hidden_proto (cairo_rel_line_to);
 slim_hidden_proto (cairo_restore);
 slim_hidden_proto (cairo_save);