From: ellson Date: Sun, 4 May 2008 17:11:49 +0000 (+0000) Subject: back out the RGB patch so that it can be applied by itself X-Git-Tag: LAST_LIBGRAPH~32^2~4093 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14976c8a321cc0f6b22c7cb89282ab6028b01138;p=graphviz back out the RGB patch so that it can be applied by itself --- diff --git a/plugin/pango/gvloadimage_pango.c b/plugin/pango/gvloadimage_pango.c index df600afec..101178dc8 100644 --- a/plugin/pango/gvloadimage_pango.c +++ b/plugin/pango/gvloadimage_pango.c @@ -101,17 +101,12 @@ static void pango_loadimage_cairo(GVJ_t * job, usershape_t *us, boxf b, boolean static void pango_loadimage_ps(GVJ_t * job, usershape_t *us, boxf b, boolean filled) { cairo_surface_t *surface; /* source surface */ - cairo_format_t format; FILE *out = job->output_file; int X, Y, x, y, stride; unsigned char *data, *ix, alpha, red, green, blue; surface = cairo_loadimage(job, us); - if (surface) { - format = cairo_image_surface_get_format(surface); - if ((format != CAIRO_FORMAT_ARGB32) && (format != CAIRO_FORMAT_RGB24)) - return; - + if (surface && (cairo_image_surface_get_format(surface) == CAIRO_FORMAT_ARGB32)) { X = cairo_image_surface_get_width(surface); Y = cairo_image_surface_get_height(surface); stride = cairo_image_surface_get_stride(surface);