[cairo] [PATCH 37/39] [OpenVG] Update cairo-openvg to compile on 1.8.2 baseline

[tardyp at gmail.com]

From: Pierre Tardy <tardyp at gmail.com>

---
 src/cairo-openvg-surface.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/cairo-openvg-surface.c b/src/cairo-openvg-surface.c
index ce3086c..197a537 100644
--- a/src/cairo-openvg-surface.c
+++ b/src/cairo-openvg-surface.c
@@ -78,16 +78,20 @@ _cairo_openvg_surface_create_similar (void            *asurface,
 }
 
 static cairo_status_t
-_cairo_openvg_surface_clone_similar (void             *asurface,
-                                     cairo_surface_t  *src,
-                                     int               sc_x,
-                                     int               sc_y,
-                                     int               width,
-                                     int               height,
-                                     cairo_surface_t **clone_out)
+_cairo_openvg_surface_clone_similar (void             *abstract_surface,
+                                       cairo_surface_t  *src,
+                                       int               src_x,
+                                       int               src_y,
+                                       int               width,
+                                       int               height,
+                                       int              *clone_offset_x,
+                                       int              *clone_offset_y,
+                                       cairo_surface_t **clone_out)
 {
     *clone_out = cairo_openvg_surface_create (width, height);
-    return CAIRO_STATUS_SUCCESS;
+    *clone_offset_x = src_x;
+    *clone_offset_y = src_y;
+   return CAIRO_STATUS_SUCCESS;
 }
 
 #include "cairo-private.h"
@@ -135,7 +139,7 @@ _cairo_openvg_surface_intersect_clip_path (void               *asurface,
     cairo_matrix_t mat;
     cairo_matrix_init_translate (&mat, 0, vgsurface->height);
     cairo_matrix_scale (&mat, 1.0, -1.0);
-    _cairo_path_fixed_device_transform (path, &mat);
+    _cairo_path_fixed_transform (path, &mat);
   }
   status = _cairo_surface_fill (image,
                        CAIRO_OPERATOR_SOURCE,
@@ -399,7 +403,7 @@ _cairo_openvg_setup_gradient_stops (cairo_openvg_surface_t   *vgsurface,
 
   for (i=0; i< numstops; i++)
     {
-      stops[i*5 + 0] = _cairo_fixed_to_double (pattern->stops[i].x);
+      stops[i*5 + 0] = pattern->stops[i].offset;
       stops[i*5 + 1] = pattern->stops[i].color.red;
       stops[i*5 + 2] = pattern->stops[i].color.green;
       stops[i*5 + 3] = pattern->stops[i].color.blue;
@@ -500,7 +504,6 @@ _cairo_openvg_setup_surface_source (cairo_openvg_surface_t  *vgsurface,
   cairo_status_t status = CAIRO_STATUS_SUCCESS;
   cairo_image_surface_t *image= (cairo_image_surface_t*)spat->surface;
   cairo_rectangle_int_t  extents;
-  unsigned char *data;
 
   status = _cairo_surface_get_extents (spat->surface, &extents);
   if (status)
@@ -796,8 +799,7 @@ _cairo_openvg_surface_paint (void             *asurface,
       cairo_surface_pattern_t *spat = (cairo_surface_pattern_t *)source;
       if (_cairo_surface_is_meta (spat->surface))
         {
-          _cairo_meta_surface_replay (spat->surface, asurface);
-          return CAIRO_STATUS_SUCCESS;
+          return _cairo_meta_surface_replay (spat->surface, asurface);
         }
     }
 
@@ -905,7 +907,8 @@ _cairo_openvg_surface_show_glyphs (void                *asurface,
                                    cairo_pattern_t     *source,
                                    cairo_glyph_t       *glyphs,
                                    int                  num_glyphs,
-                                   cairo_scaled_font_t *scaled_font)
+                                   cairo_scaled_font_t *scaled_font,
+				   int		 *remaining_glyphs)
 {
   cairo_status_t status = CAIRO_STATUS_SUCCESS;
   cairo_path_fixed_t path;
-- 
1.6.0.4