callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: use GEGL to convert a TempBuf to a GdkPixbuf

Browse Source
This commit is contained in:
Michael Natterer
2012-04-08 00:19:50 +02:00
parent d743bae6a7
commit b521cb4272
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/core/gimpviewable.c
View File

@ -31,6 +31,8 @@
#include "base/temp-buf.h" #include "base/temp-buf.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimp-utils.h" #include "gimp-utils.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpmarshal.h" #include "gimpmarshal.h"
@ -353,41 +355,22 @@ gimp_viewable_real_get_new_pixbuf (GimpViewable *viewable,
if (temp_buf) if (temp_buf)
{ {
TempBuf *color_buf = NULL; GeglBuffer *src_buffer;
gint width; GeglBuffer *dest_buffer;
gint height;
gint bytes;
bytes = temp_buf->bytes; pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
width = temp_buf->width; temp_buf->bytes == 4 || temp_buf->bytes == 2,
height = temp_buf->height; 8,
temp_buf->width,
temp_buf->height);
if (bytes == 1 || bytes == 2) src_buffer = gimp_temp_buf_create_buffer (temp_buf, NULL, FALSE);
{ dest_buffer = gimp_pixbuf_create_buffer (pixbuf);
gint color_bytes;
color_bytes = (bytes == 2) ? 4 : 3; gegl_buffer_copy (src_buffer, NULL, dest_buffer, NULL);
color_buf = temp_buf_new (width, height, color_bytes); g_object_unref (src_buffer);
temp_buf_copy (temp_buf, color_buf); g_object_unref (dest_buffer);
temp_buf = color_buf;
bytes = color_bytes;
}
pixbuf = gdk_pixbuf_new_from_data (g_memdup (temp_buf_get_data (temp_buf),
width * height * bytes),
GDK_COLORSPACE_RGB,
(bytes == 4),
8,
width,
height,
width * bytes,
(GdkPixbufDestroyNotify) g_free,
NULL);
if (color_buf)
temp_buf_free (color_buf);
} }
return pixbuf; return pixbuf;