AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdkcairo: Split out a function

Browse Source 
This is in preparation for the next patch.
This commit is contained in:
Benjamin Otte 2013-09-24 16:34:24 +02:00
parent 9019c2bfb9
commit 1959e36066
1 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
gdk/gdkcairo.c
View File

@ -175,45 +175,32 @@ gdk_cairo_region (cairo_t *cr,
} }
} }
/** static void
* gdk_cairo_surface_create_from_pixbuf: gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface,
* @pixbuf: a #GdkPixbuf const GdkPixbuf *pixbuf)
* @scale: the scale of the new surface, or 0 to use same as @window
* @for_window: The window this will be drawn to, on %NULL.
*
* Creates an image surface with the same contents as
* the pixbuf.
*
* Returns: a new cairo surface, must be freed with cairo_surface_destroy()
*
* Since: 3.10
*/
cairo_surface_t *
gdk_cairo_surface_create_from_pixbuf (const GdkPixbuf *pixbuf,
int scale,
GdkWindow *for_window)
{ {
gint width = gdk_pixbuf_get_width (pixbuf); gint width, height;
gint height = gdk_pixbuf_get_height (pixbuf); guchar *gdk_pixels, *cairo_pixels;
guchar *gdk_pixels = gdk_pixbuf_get_pixels (pixbuf); int gdk_rowstride, cairo_stride;
int gdk_rowstride = gdk_pixbuf_get_rowstride (pixbuf); int n_channels;
int n_channels = gdk_pixbuf_get_n_channels (pixbuf);
int cairo_stride;
guchar *cairo_pixels;
cairo_format_t format;
cairo_surface_t *surface;
int j; int j;
if (n_channels == 3) /* This function can't just copy any pixbuf to any surface, be
format = CAIRO_FORMAT_RGB24; * sure to read the invariants here before calling it */
else
format = CAIRO_FORMAT_ARGB32;
surface = g_assert (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE);
gdk_window_create_similar_image_surface (for_window, g_assert (cairo_image_surface_get_format (surface) == CAIRO_FORMAT_RGB24 ||
format, cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32);
width, height, g_assert (cairo_image_surface_get_width (surface) == gdk_pixbuf_get_width (pixbuf));
scale); g_assert (cairo_image_surface_get_height (surface) == gdk_pixbuf_get_height (pixbuf));
cairo_surface_flush (surface);
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
gdk_pixels = gdk_pixbuf_get_pixels (pixbuf);
gdk_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
cairo_stride = cairo_image_surface_get_stride (surface); cairo_stride = cairo_image_surface_get_stride (surface);
cairo_pixels = cairo_image_surface_get_data (surface); cairo_pixels = cairo_image_surface_get_data (surface);
@ -274,6 +261,43 @@ gdk_cairo_surface_create_from_pixbuf (const GdkPixbuf *pixbuf,
} }
cairo_surface_mark_dirty (surface); cairo_surface_mark_dirty (surface);
}
/**
* gdk_cairo_surface_create_from_pixbuf:
* @pixbuf: a #GdkPixbuf
* @scale: the scale of the new surface, or 0 to use same as @window
* @for_window: The window this will be drawn to, on %NULL.
*
* Creates an image surface with the same contents as
* the pixbuf.
*
* Returns: a new cairo surface, must be freed with cairo_surface_destroy()
*
* Since: 3.10
*/
cairo_surface_t *
gdk_cairo_surface_create_from_pixbuf (const GdkPixbuf *pixbuf,
int scale,
GdkWindow *for_window)
{
cairo_format_t format;
cairo_surface_t *surface;
if (gdk_pixbuf_get_n_channels (pixbuf) == 3)
format = CAIRO_FORMAT_RGB24;
else
format = CAIRO_FORMAT_ARGB32;
surface =
gdk_window_create_similar_image_surface (for_window,
format,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf),
scale);
gdk_cairo_surface_paint_pixbuf (surface, pixbuf);
return surface; return surface;
} }