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

libgimp: add GEGL branch to gimp_layer_new_from_pixbuf() 

can't get rid of the legacy impl yet bacause plug-ins need to be able
to run in compat mode.
This commit is contained in:
Michael Natterer 2012-05-03 03:48:49 +02:00
parent 3ad73b3658
commit 48a264ce4b
1 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
libgimp/gimplayer.c
View File

@ -116,18 +116,11 @@ gimp_layer_new_from_pixbuf (gint32 image_ID,
gdouble progress_start, gdouble progress_start,
gdouble progress_end) gdouble progress_end)
{ {
GimpDrawable *drawable; gint32 layer;
GimpPixelRgn rgn; gint width;
const guchar *pixels; gint height;
gpointer pr; gint bpp;
gint32 layer; gdouble range = progress_end - progress_start;
gint width;
gint height;
gint rowstride;
gint bpp;
gdouble range = progress_end - progress_start;
guint count = 0;
guint done = 0;
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1); g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
@ -143,9 +136,9 @@ gimp_layer_new_from_pixbuf (gint32 image_ID,
return -1; return -1;
} }
width = gdk_pixbuf_get_width (pixbuf); width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf); height = gdk_pixbuf_get_height (pixbuf);
bpp = gdk_pixbuf_get_n_channels (pixbuf); bpp = gdk_pixbuf_get_n_channels (pixbuf);
layer = gimp_layer_new (image_ID, name, width, height, layer = gimp_layer_new (image_ID, name, width, height,
bpp == 3 ? GIMP_RGB_IMAGE : GIMP_RGBA_IMAGE, bpp == 3 ? GIMP_RGB_IMAGE : GIMP_RGBA_IMAGE,
@ -154,46 +147,70 @@ gimp_layer_new_from_pixbuf (gint32 image_ID,
if (layer == -1) if (layer == -1)
return -1; return -1;
drawable = gimp_drawable_get (layer); if (gimp_plugin_precision_enabled ())
gimp_pixel_rgn_init (&rgn, drawable, 0, 0, width, height, TRUE, FALSE);
g_assert (bpp == rgn.bpp);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
pixels = gdk_pixbuf_get_pixels (pixbuf);
for (pr = gimp_pixel_rgns_register (1, &rgn);
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{ {
const guchar *src = pixels + rgn.y * rowstride + rgn.x * bpp; GeglBuffer *src_buffer;
guchar *dest = rgn.data; GeglBuffer *dest_buffer;
gint y;
for (y = 0; y < rgn.h; y++) src_buffer = gimp_pixbuf_create_buffer (pixbuf);
dest_buffer = gimp_drawable_get_buffer (layer);
gegl_buffer_copy (src_buffer, NULL, dest_buffer, NULL);
g_object_unref (src_buffer);
g_object_unref (dest_buffer);
}
else
{
GimpDrawable *drawable;
GimpPixelRgn rgn;
gpointer pr;
const guchar *pixels;
gint rowstride;
guint done = 0;
guint count = 0;
drawable = gimp_drawable_get (layer);
gimp_pixel_rgn_init (&rgn, drawable, 0, 0, width, height, TRUE, FALSE);
g_assert (bpp == rgn.bpp);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
pixels = gdk_pixbuf_get_pixels (pixbuf);
for (pr = gimp_pixel_rgns_register (1, &rgn);
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{ {
memcpy (dest, src, rgn.w * rgn.bpp); const guchar *src = pixels + rgn.y * rowstride + rgn.x * bpp;
guchar *dest = rgn.data;
gint y;
src += rowstride; for (y = 0; y < rgn.h; y++)
dest += rgn.rowstride; {
memcpy (dest, src, rgn.w * rgn.bpp);
src += rowstride;
dest += rgn.rowstride;
}
if (range > 0.0)
{
done += rgn.h * rgn.w;
if (count++ % 32 == 0)
gimp_progress_update (progress_start +
(gdouble) done / (width * height) * range);
}
} }
if (range > 0.0) gimp_drawable_detach (drawable);
{
done += rgn.h * rgn.w;
if (count++ % 32 == 0)
gimp_progress_update (progress_start +
(gdouble) done / (width * height) * range);
}
} }
if (range > 0.0) if (range > 0.0)
gimp_progress_update (progress_end); gimp_progress_update (progress_end);
gimp_drawable_detach (drawable);
return layer; return layer;
} }