From b3e785e5e581a563f3b95c6a9f451dd43ab9a47d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 3 May 2012 04:19:41 +0200 Subject: [PATCH] libgimpcolor: return the right format from gimp_cairo_surface_get_format() --- libgimpcolor/gimpcairo.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libgimpcolor/gimpcairo.c b/libgimpcolor/gimpcairo.c index 0382fa764e..27924517a1 100644 --- a/libgimpcolor/gimpcairo.c +++ b/libgimpcolor/gimpcairo.c @@ -150,11 +150,8 @@ gimp_cairo_surface_get_format (cairo_surface_t *surface) switch (cairo_image_surface_get_format (surface)) { - case CAIRO_FORMAT_RGB24: - return babl_format ("cairo-ARGB32"); - - case CAIRO_FORMAT_ARGB32: - return babl_format ("cairo-RGB24"); + case CAIRO_FORMAT_RGB24: return babl_format ("cairo-RGB24"); + case CAIRO_FORMAT_ARGB32: return babl_format ("cairo-ARGB32"); default: break; @@ -174,9 +171,9 @@ gimp_cairo_surface_create_buffer (cairo_surface_t *surface) g_return_val_if_fail (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE, NULL); + format = gimp_cairo_surface_get_format (surface); width = cairo_image_surface_get_width (surface); height = cairo_image_surface_get_height (surface); - format = gimp_cairo_surface_get_format (surface); return gegl_buffer_linear_new_from_data (cairo_image_surface_get_data (surface),