← Back to branch summary

~ubuntu-branches/ubuntu/raring/librsvg/raring-proposed

« back to all changes in this revision

Viewing changes to rsvg-cairo-draw.c

  • Committer: Package Import Robot
  • Author(s): Simon McVittie
  • Date: 2012-10-22 20:17:48 UTC
  • mfrom: (1.2.1) (34.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20121022201748-6frue379at27szqm
Tags: 2.36.4-1
https://launchpad.net/bugs/1038843
* Team upload
* New upstream version (LP: #1038843)
* Use dh-autoreconf with --as-needed instead of patching ltmain.sh
  (from Ubuntu, thanks Iain Lane)
* Enable Vala bindings (based on Ubuntu changes, thanks to Robert Ancell)
  - Build-Conflicts: valac-0.16 because if both are installed, the
    default version 0.16 is selected, breaking our build

Show diffs side-by-side

added added

removed removed

Lines of Context:
rsvg-cairo-draw.c
44
44
static const cairo_user_data_key_t surface_pixel_data_key;
45
45
 
46
46
static void
47
 
rsvg_pixmap_destroy (gchar * pixels, gpointer data)
48
 
{
49
 
    g_free (pixels);
50
 
}
51
 
 
52
 
static void
53
47
_pattern_add_rsvg_color_stops (cairo_pattern_t * pattern,
54
48
                               GPtrArray * stops, guint32 current_color_rgb, guint8 opacity)
55
49
{
574
568
 
575
569
    int width, height;
576
570
    double dwidth, dheight;
577
 
    int j;
578
571
    RsvgBbox bbox;
579
572
 
580
573
    if (surface == NULL)
936
929
    surface = cairo_image_surface_create (format, width, height);
937
930
    if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) {
938
931
        cairo_surface_destroy (surface);
939
 
        return;
 
932
        return NULL;
940
933
    }
941
934
 
942
935
    cairo_pixels = cairo_image_surface_get_data (surface);