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

app: remove "bytes" from GimpBuffer and add a format API

Browse Source 
and change all users accordingly.
This commit is contained in:
Michael Natterer
2012-03-31 19:31:43 +02:00
parent 818739a0e3
commit 2d81a16bdf
5 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/core/gimpbuffer.c
View File

@ -196,19 +196,19 @@ gimp_buffer_get_new_preview (GimpViewable *viewable,
gint height)
{
GimpBuffer *buffer = GIMP_BUFFER (viewable);
const Babl *format = gimp_buffer_get_format (buffer);
TempBuf *preview;
preview = temp_buf_new (width, height, gimp_buffer_get_bytes (buffer),
preview = temp_buf_new (width, height,
babl_format_get_bytes_per_pixel (format),
0, 0, NULL);
gegl_buffer_get (buffer->buffer,
NULL,
MIN ((gdouble) width / (gdouble) gimp_buffer_get_width (buffer),
gegl_buffer_get (buffer->buffer, NULL,
MIN ((gdouble) width / (gdouble) gimp_buffer_get_width (buffer),
(gdouble) height / (gdouble) gimp_buffer_get_height (buffer)),
gimp_bpp_to_babl_format (gimp_buffer_get_bytes (buffer)),
NULL,
temp_buf_get_data (preview),
width * gimp_buffer_get_bytes (buffer),
GEGL_ABYSS_NONE);
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
return preview;
}
@ -296,12 +296,12 @@ gimp_buffer_get_height (const GimpBuffer *buffer)
return gegl_buffer_get_height (buffer->buffer);
}
gint
gimp_buffer_get_bytes (const GimpBuffer *buffer)
const Babl *
gimp_buffer_get_format (const GimpBuffer *buffer)
{
g_return_val_if_fail (GIMP_IS_BUFFER (buffer), 0);
g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
return GIMP_IMAGE_TYPE_BYTES (buffer->image_type);
return gegl_buffer_get_format (buffer->buffer);
}
GimpImageType

2
app/core/gimpbuffer.h
View File

@ -63,8 +63,8 @@ GimpBuffer * gimp_buffer_new_from_pixbuf (GdkPixbuf *pixbuf,
gint gimp_buffer_get_width (const GimpBuffer *buffer);
gint gimp_buffer_get_height (const GimpBuffer *buffer);
const Babl * gimp_buffer_get_format (const GimpBuffer *buffer);
gint gimp_buffer_get_bytes (const GimpBuffer *buffer);
GimpImageType gimp_buffer_get_image_type (const GimpBuffer *buffer);
GeglBuffer * gimp_buffer_get_buffer (const GimpBuffer *buffer);

18
app/core/gimppatternclipboard.c
View File

@ -188,23 +188,23 @@ gimp_pattern_clipboard_buffer_changed (Gimp *gimp,
if (gimp->global_buffer)
{
GimpBuffer *buffer = gimp->global_buffer;
gint width;
gint height;
gint bytes;
GimpBuffer *buffer = gimp->global_buffer;
const Babl *format = gimp_buffer_get_format (buffer);
gint width;
gint height;
gint bytes;
width = MIN (gimp_buffer_get_width (buffer), 512);
height = MIN (gimp_buffer_get_height (buffer), 512);
bytes = gimp_buffer_get_bytes (buffer);
bytes = babl_format_get_bytes_per_pixel (format);
pattern->mask = temp_buf_new (width, height, bytes, 0, 0, NULL);
gegl_buffer_get (gimp_buffer_get_buffer (buffer),
GIMP_GEGL_RECT (0,0,width,height), 1.0,
gimp_bpp_to_babl_format (bytes),
GIMP_GEGL_RECT (0, 0, width, height), 1.0,
NULL,
temp_buf_get_data (pattern->mask),
width * gimp_buffer_get_bytes (buffer),
GEGL_ABYSS_NONE);
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
}
else
{

6
app/pdb/buffer-cmds.c
View File

@ -225,7 +225,11 @@ buffer_get_bytes_invoker (GimpProcedure *procedure,
GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
if (buffer)
bytes = gimp_buffer_get_bytes (buffer);
{
const Babl *format = gimp_buffer_get_format (buffer);
bytes = babl_format_get_bytes_per_pixel (format);
}
else
success = FALSE;
}

6
tools/pdbgen/pdb/buffer.pdb
View File

@ -191,7 +191,11 @@ sub buffer_get_bytes {
GimpBuffer *buffer = gimp_pdb_get_buffer (gimp, buffer_name, error);
if (buffer)
bytes = gimp_buffer_get_bytes (buffer);
{
const Babl *format = gimp_buffer_get_format (buffer);
bytes = babl_format_get_bytes_per_pixel (format);
}
else
success = FALSE;
}