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

the pixmap's size is width * height * bpp, not just width * height. 

2006-11-21  Michael Natterer  <mitch@gimp.org>

	* tools/pdbgen/pdb/brush.pdb (brush_get_pixels): the pixmap's size
	is width * height * bpp, not just width * height.

	* app/pdb/brush_cmds.c: regenerated.
This commit is contained in:
Michael Natterer 2006-11-21 22:43:41 +00:00 committed by Michael Natterer
parent e48c677fec
commit 7d30e91cf5
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,10 @@
2006-11-21 Michael Natterer <mitch@gimp.org>
* tools/pdbgen/pdb/brush.pdb (brush_get_pixels): the pixmap's size
is width * height * bpp, not just width * height.
* app/pdb/brush_cmds.c: regenerated.
2006-11-21 Simon Budig <simon@gimp.org> 2006-11-21 Simon Budig <simon@gimp.org>
* plug-ins/metadata/metadata.h: fixed typo spotted by John Marshall * plug-ins/metadata/metadata.h: fixed typo spotted by John Marshall
@ -23,8 +30,8 @@
* plug-ins/help/gimphelp.[ch] * plug-ins/help/gimphelp.[ch]
* plug-ins/help/gimphelpdomain.[ch] * plug-ins/help/gimphelpdomain.[ch]
* plug-ins/help/gimphelpitem.[ch] * plug-ins/help/gimphelpitem.[ch]
* plug-ins/help/gimphelplocale.[ch]: ...completely chopped and * plug-ins/help/gimphelplocale.[ch]: ...completely chopped them
added as new private utility library. Soon to be used by the and added a new private utility library. Soon to be used by the
helpbrowser too. helpbrowser too.
* plug-ins/help/Makefile.am * plug-ins/help/Makefile.am

6
app/pdb/brush_cmds.c
View File

@ -339,13 +339,15 @@ brush_get_pixels_invoker (GimpProcedure *procedure,
width = brush->mask->width; width = brush->mask->width;
height = brush->mask->height; height = brush->mask->height;
mask_bpp = brush->mask->bytes; mask_bpp = brush->mask->bytes;
num_mask_bytes = brush->mask->height * brush->mask->width; num_mask_bytes = brush->mask->height * brush->mask->width *
brush->mask->bytes;
mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes); mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes);
if (brush->pixmap) if (brush->pixmap)
{ {
color_bpp = brush->pixmap->bytes; color_bpp = brush->pixmap->bytes;
num_color_bytes = brush->pixmap->height * brush->pixmap->width; num_color_bytes = brush->pixmap->height * brush->pixmap->width *
brush->pixmap->bytes;
color_bytes = g_memdup (temp_buf_data (brush->pixmap), color_bytes = g_memdup (temp_buf_data (brush->pixmap),
num_color_bytes); num_color_bytes);
} }

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

@ -318,13 +318,15 @@ HELP
width = brush->mask->width; width = brush->mask->width;
height = brush->mask->height; height = brush->mask->height;
mask_bpp = brush->mask->bytes; mask_bpp = brush->mask->bytes;
num_mask_bytes = brush->mask->height * brush->mask->width; num_mask_bytes = brush->mask->height * brush->mask->width *
brush->mask->bytes;
mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes); mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes);
if (brush->pixmap) if (brush->pixmap)
{ {
color_bpp = brush->pixmap->bytes; color_bpp = brush->pixmap->bytes;
num_color_bytes = brush->pixmap->height * brush->pixmap->width; num_color_bytes = brush->pixmap->height * brush->pixmap->width *
brush->pixmap->bytes;
color_bytes = g_memdup (temp_buf_data (brush->pixmap), color_bytes = g_memdup (temp_buf_data (brush->pixmap),
num_color_bytes); num_color_bytes);
} }