dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: add gimp_pixbuf_create_buffer() and use it in GimpBuffer

This commit is contained in:
Michael Natterer 2012-03-17 23:14:14 +01:00
parent 3ce071b89a
commit 553e65e859
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/core/gimpbuffer.c
View File

@ -259,30 +259,16 @@ gimp_buffer_new_from_pixbuf (GdkPixbuf *pixbuf,
gint offset_x,
gint offset_y)
{
GimpBuffer *gimp_buffer;
GeglBuffer *buffer;
gint width;
gint height;
gint rowstride;
gint channels;
GeglRectangle rect = { 0, };
GimpBuffer *gimp_buffer;
GeglBuffer *buffer;
gint channels;
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
g_return_val_if_fail (name != NULL, NULL);
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
channels = gdk_pixbuf_get_n_channels (pixbuf);
channels = gdk_pixbuf_get_n_channels (pixbuf);
rect.width = width;
rect.height = height;
buffer = gegl_buffer_linear_new_from_data (gdk_pixbuf_get_pixels (pixbuf),
gimp_bpp_to_babl_format (channels,
TRUE),
&rect, rowstride,
NULL, NULL);
buffer = gimp_pixbuf_create_buffer (pixbuf);
gimp_buffer = gimp_buffer_new (buffer, name,
GIMP_IMAGE_TYPE_FROM_BYTES (channels),

27
app/gegl/gimp-gegl-utils.c
View File

@ -132,6 +132,33 @@ gimp_interpolation_to_gegl_filter (GimpInterpolationType interpolation)
return "nearest";
}
GeglBuffer *
gimp_pixbuf_create_buffer (GdkPixbuf *pixbuf)
{
gint width;
gint height;
gint rowstride;
gint channels;
GeglRectangle rect = { 0, };
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
channels = gdk_pixbuf_get_n_channels (pixbuf);
rect.width = width;
rect.height = height;
return gegl_buffer_linear_new_from_data (gdk_pixbuf_get_pixels (pixbuf),
gimp_bpp_to_babl_format (channels,
TRUE),
&rect, rowstride,
(GDestroyNotify) g_object_unref,
pixbuf);
}
GeglBuffer *
gimp_tile_manager_create_buffer (TileManager *tm,
const Babl *format,

6
app/gegl/gimp-gegl-utils.h
View File

@ -22,15 +22,19 @@
#define __GIMP_GEGL_UTILS_H__
#include <gdk-pixbuf/gdk-pixbuf.h> /* temp hack */
const Babl * gimp_bpp_to_babl_format (guint bpp,
gboolean linear) G_GNUC_CONST;
const gchar * gimp_layer_mode_to_gegl_operation (GimpLayerModeEffects mode) G_GNUC_CONST;
const gchar * gimp_interpolation_to_gegl_filter (GimpInterpolationType interpolation) G_GNUC_CONST;
GeglBuffer * gimp_tile_manager_create_buffer (TileManager *tm,
GeglBuffer * gimp_tile_manager_create_buffer (TileManager *tm,
const Babl *format,
gboolean write);
GeglBuffer * gimp_pixbuf_create_buffer (GdkPixbuf *pixbuf);
void gimp_gegl_buffer_refetch_tiles (GeglBuffer *buffer);