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

return the mask's bpp and the brush's pixmap data if it has one.

Browse Source 
2004-10-06  Michael Natterer  <mitch@gimp.org>

	* tools/pdbgen/pdb/brush.pdb: return the mask's bpp and the
	brush's pixmap data if it has one.

	* tools/pdbgen/pdb/pattern.pdb: cleaned up.

	* tools/pdbgen/pdb/image.pdb: added $deprecated = 1 to deprecated
	functions even if they are not exported to libgimp any more.

	* app/pdb/procedural_db.h (struct ProcRecord): added member
	"gboolean deprecated".

	* tools/pdbgen/app.pl
	* app/xcf/xcf.c: fill it accordingly.

	* app/plug-in/plug-in-message.c (plug_in_handle_proc_run): warn
	not only for deprecated procedured which are in the compat hach
	table, but also for procedures with deprecated flag set to TRUE.

	* app/pdb/*_cmds.c
	* libgimp/gimpbrush_pdb.[ch]
	* libgimp/gimppattern_pdb.[ch]: regenerated.

	* libgimp/gimpbrushmenu.c
	* plug-ins/gfig/gfig-style.c: changed accordingly.
This commit is contained in:
Michael Natterer
2004-10-06 03:23:09 +00:00
committed by Michael Natterer
parent b69d2599fd
commit 7ed9a2885c
60 changed files with 721 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libgimp/gimpbrushmenu.c
View File

@ -114,10 +114,14 @@ gimp_brush_select_widget_new (const gchar *title,
GimpRunBrushCallback callback,
gpointer data)
{
BrushSelect *brush_sel;
GtkWidget *frame;
GtkWidget *hbox;
gint mask_data_size;
BrushSelect *brush_sel;
GtkWidget *frame;
GtkWidget *hbox;
gint mask_bpp;
gint mask_data_size;
gint color_bpp;
gint color_data_size;
guint8 *color_data;
g_return_val_if_fail (callback != NULL, NULL);
@ -171,9 +175,16 @@ gimp_brush_select_widget_new (const gchar *title,
if (gimp_brush_get_pixels (brush_sel->brush_name,
&brush_sel->width,
&brush_sel->height,
&mask_bpp,
&mask_data_size,
&brush_sel->mask_data))
&brush_sel->mask_data,
&color_bpp,
&color_data_size,
&color_data))
{
if (color_data)
g_free (color_data);
if (opacity == -1)
brush_sel->opacity = gimp_context_get_opacity ();
else
@ -249,11 +260,15 @@ gimp_brush_select_widget_set (GtkWidget *widget,
}
else
{
gchar *name;
gint width;
gint height;
gint mask_bpp;
gint mask_data_size;
guint8 *mask_data;
gchar *name;
gint color_bpp;
gint color_data_size;
guint8 *color_data;
if (! brush_name || ! strlen (brush_name))
name = gimp_context_get_brush ();
@ -263,9 +278,16 @@ gimp_brush_select_widget_set (GtkWidget *widget,
if (gimp_brush_get_pixels (name,
&width,
&height,
&mask_bpp,
&mask_data_size,
&mask_data))
&mask_data,
&color_bpp,
&color_data_size,
&color_data))
{
if (color_data)
g_free (color_data);
if (opacity == -1.0)
opacity = gimp_context_get_opacity ();