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

removed all the "typedef gimage_function gimp_image_function" stuff so we 

2000-12-30  Michael Natterer  <mitch@gimp.org>

	* app/gimage.[ch]: removed all the
	"typedef gimage_function gimp_image_function" stuff so we can clearly
	see what is really a GImage function.
	Removed gimage_get_ID(). Use pdb_id_to_image() instead.

	* app/airbrush.c
	* app/desaturate.c
	* app/disp_callbacks.c
	* app/equalize.c
	* app/fileops.c
	* app/floating_sel.c
	* app/gdisplay_ops.c
	* app/gimpdrawable.c
	* app/global_edit.c
	* app/image_map.c
	* app/invert.c
	* app/lc_dialog.c
	* app/paths_dialog.c
	* app/plug_in.c
	* app/xcf.c

	* app/color_cmds.c
	* app/convert_cmds.c
	* app/image_cmds.c
	* tools/pdbgen/pdb/color.pdb
	* tools/pdbgen/pdb/convert.pdb
	* tools/pdbgen/pdb/image.pdb: changed accordingly.
This commit is contained in:
Michael Natterer 2000-12-30 00:16:50 +00:00 committed by Michael Natterer
parent bc3a4b2916
commit 4a0f7c5866
62 changed files with 476 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,3 +1,33 @@
2000-12-30 Michael Natterer <mitch@gimp.org>
* app/gimage.[ch]: removed all the
"typedef gimage_function gimp_image_function" stuff so we can clearly
see what is really a GImage function.
Removed gimage_get_ID(). Use pdb_id_to_image() instead.
* app/airbrush.c
* app/desaturate.c
* app/disp_callbacks.c
* app/equalize.c
* app/fileops.c
* app/floating_sel.c
* app/gdisplay_ops.c
* app/gimpdrawable.c
* app/global_edit.c
* app/image_map.c
* app/invert.c
* app/lc_dialog.c
* app/paths_dialog.c
* app/plug_in.c
* app/xcf.c
* app/color_cmds.c
* app/convert_cmds.c
* app/image_cmds.c
* tools/pdbgen/pdb/color.pdb
* tools/pdbgen/pdb/convert.pdb
* tools/pdbgen/pdb/image.pdb: changed accordingly.
2000-12-29 Sven Neumann <sven@gimp.org>
* TODO.xml: more things to do

8
app/actions/plug-in-commands.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

4
app/airbrush.c
View File

@ -27,7 +27,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gradient.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpbrush.h"
#include "gimpcontext.h"
#include "gimpui.h"
@ -340,7 +340,7 @@ airbrush_motion (PaintCore *paint_core,
}
else
{
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
col[area->bytes - 1] = OPAQUE_OPACITY;
color_pixels (temp_buf_data (area), col,
area->width * area->height, area->bytes);

3
app/color_cmds.c
View File

@ -31,7 +31,6 @@
#include "desaturate.h"
#include "drawable.h"
#include "equalize.h"
#include "gimage.h"
#include "gimpdrawable.h"
#include "gimphistogram.h"
#include "gimpimage.h"
@ -960,7 +959,7 @@ histogram_invoker (Argument *args)
x1, y1, (x2 - x1), (y2 - y1), FALSE);
/* Configure the mask from the gimage's selection mask */
mask = gimage_get_mask (drawable_gimage (GIMP_DRAWABLE (drawable)));
mask = gimp_image_get_mask (drawable_gimage (GIMP_DRAWABLE (drawable)));
pixel_region_init (&maskPR, gimp_drawable_data (GIMP_DRAWABLE(mask)),
x1 + off_x, y1 + off_y, (x2 - x1), (y2 - y1), FALSE);

8
app/convert_cmds.c
View File

@ -28,7 +28,7 @@
#include "procedural_db.h"
#include "convert.h"
#include "gimage.h"
#include "gimpimage.h"
#include "palette.h"
#include "palette_entries.h"
@ -55,7 +55,7 @@ convert_rgb_invoker (Argument *args)
success = FALSE;
if (success)
if ((success = (gimage_base_type (gimage) != RGB)))
if ((success = (gimp_image_base_type (gimage) != RGB)))
convert_image ((void *) gimage, RGB, 0, 0, 0, 1, 0);
return procedural_db_return_args (&convert_rgb_proc, success);
@ -97,7 +97,7 @@ convert_grayscale_invoker (Argument *args)
success = FALSE;
if (success)
if ((success = (gimage_base_type (gimage) != GRAY)))
if ((success = (gimp_image_base_type (gimage) != GRAY)))
convert_image ((void *) gimage, GRAY, 0, 0, 0, 1, 0);
return procedural_db_return_args (&convert_grayscale_proc, success);
@ -162,7 +162,7 @@ convert_indexed_invoker (Argument *args)
if (success)
{
if ((success = (gimage_base_type (gimage) != INDEXED)))
if ((success = (gimp_image_base_type (gimage) != INDEXED)))
{
PaletteEntries *entries;
PaletteEntries *the_palette = NULL;

42
app/core/gimp-edit.c
View File

@ -340,7 +340,7 @@ edit_paste (GImage *gimage,
* it seems like the correct behavior.
*/
if (! gimage_mask_is_empty (gimage) && !paste_into)
channel_clear (gimage_get_mask (gimage));
channel_clear (gimp_image_get_mask (gimage));
/* if there's a drawable, add a new floating selection */
if (drawable != NULL)
@ -350,7 +350,7 @@ edit_paste (GImage *gimage,
else
{
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
}
/* end the group undo */
@ -375,7 +375,7 @@ edit_paste_as_new (GImage *invoke,
/* create a new image (always of type RGB) */
gimage = gimage_new (paste->width, paste->height, RGB);
gimage_disable_undo (gimage);
gimp_image_undo_disable (gimage);
gimp_image_set_resolution (gimage, invoke->xresolution, invoke->yresolution);
gimp_image_set_unit (gimage, invoke->unit);
@ -389,9 +389,9 @@ edit_paste_as_new (GImage *invoke,
{
/* add the new layer to the image */
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
gimage_enable_undo (gimage);
gimp_image_undo_enable (gimage);
gdisp = gdisplay_new (gimage, 0x0101);
gimp_context_set_display (gimp_context_get_user (), gdisp);
@ -414,7 +414,7 @@ edit_clear (GImage *gimage,
if (!gimage || drawable == NULL)
return FALSE;
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
if (drawable_has_alpha (drawable))
col [drawable_bytes (drawable) - 1] = OPAQUE_OPACITY;
@ -428,8 +428,8 @@ edit_clear (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -459,11 +459,11 @@ edit_fill (GImage *gimage,
switch (fill_type)
{
case FOREGROUND_FILL:
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
break;
case BACKGROUND_FILL:
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
case WHITE_FILL:
@ -485,7 +485,7 @@ edit_fill (GImage *gimage,
default:
g_warning ("unknown fill type");
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
}
@ -499,8 +499,8 @@ edit_fill (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -517,7 +517,7 @@ global_edit_cut (GDisplay *gdisp)
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_cut (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
/* flush the display */
@ -529,7 +529,7 @@ global_edit_cut (GDisplay *gdisp)
gboolean
global_edit_copy (GDisplay *gdisp)
{
if (!edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_copy (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
return TRUE;
@ -542,7 +542,7 @@ global_edit_paste (GDisplay *gdisp,
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_paste (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
if (!edit_paste (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage),
global_buf, paste_into))
return FALSE;
@ -613,13 +613,13 @@ named_buffer_paste_foreach (GtkWidget *widget,
{
case PASTE:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, FALSE);
break;
case PASTE_INTO:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, TRUE);
break;
@ -856,7 +856,8 @@ cut_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_cut (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
gdisplays_flush ();
@ -892,7 +893,8 @@ copy_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_copy (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
}

4
app/core/gimpdrawable-desaturate.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "desaturate.h"
#include "gimage.h"
#include "gimpimage.h"
#include "paint_funcs.h"
#include "pixel_region.h"
@ -37,7 +37,7 @@ image_desaturate (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (! drawable_color (drawable))
{

4
app/core/gimpdrawable-equalize.c
View File

@ -24,7 +24,7 @@
#include "drawable.h"
#include "equalize.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "gimphistogram.h"
@ -39,7 +39,7 @@ image_equalize (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

4
app/core/gimpdrawable-invert.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "invert.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "pixel_processor.h"
@ -42,7 +42,7 @@ image_invert (GimpImage *gimage)
Argument *return_vals;
gint nreturn_vals;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

12
app/core/gimpdrawable.c
View File

@ -31,8 +31,8 @@
#include "layer.h"
#include "gimppreviewcache.h"
#include "gimpsignal.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "gimpparasite.h"
#include "paint_funcs.h"
#include "parasitelist.h"
@ -153,8 +153,8 @@ gimp_drawable_merge_shadow (GimpDrawable *drawable,
gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
pixel_region_init (&shadowPR, gimage->shadow, x1, y1,
(x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &shadowPR, undo, OPAQUE_OPACITY,
REPLACE_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &shadowPR, undo, OPAQUE_OPACITY,
REPLACE_MODE, NULL, x1, y1);
}
void
@ -196,7 +196,7 @@ gimp_drawable_fill (GimpDrawable *drawable,
c[RED_PIX] = r;
c[GREEN_PIX] = g;
c[BLUE_PIX] = b;
gimage_transform_color (gimage, drawable, c, &i, RGB);
gimp_image_transform_color (gimage, drawable, c, &i, RGB);
c[INDEXED_PIX] = i;
if (gimp_drawable_type (drawable) == INDEXEDA_GIMAGE)
c[ALPHA_I_PIX] = a;
@ -660,8 +660,8 @@ gimp_drawable_shadow (GimpDrawable *drawable)
if (! (gimage = gimp_drawable_gimage (drawable)))
return NULL;
return gimage_shadow (gimage, drawable->width, drawable->height,
drawable->bytes);
return gimp_image_shadow (gimage, drawable->width, drawable->height,
drawable->bytes);
}
int

42
app/core/gimpedit.c
View File

@ -340,7 +340,7 @@ edit_paste (GImage *gimage,
* it seems like the correct behavior.
*/
if (! gimage_mask_is_empty (gimage) && !paste_into)
channel_clear (gimage_get_mask (gimage));
channel_clear (gimp_image_get_mask (gimage));
/* if there's a drawable, add a new floating selection */
if (drawable != NULL)
@ -350,7 +350,7 @@ edit_paste (GImage *gimage,
else
{
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
}
/* end the group undo */
@ -375,7 +375,7 @@ edit_paste_as_new (GImage *invoke,
/* create a new image (always of type RGB) */
gimage = gimage_new (paste->width, paste->height, RGB);
gimage_disable_undo (gimage);
gimp_image_undo_disable (gimage);
gimp_image_set_resolution (gimage, invoke->xresolution, invoke->yresolution);
gimp_image_set_unit (gimage, invoke->unit);
@ -389,9 +389,9 @@ edit_paste_as_new (GImage *invoke,
{
/* add the new layer to the image */
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
gimage_enable_undo (gimage);
gimp_image_undo_enable (gimage);
gdisp = gdisplay_new (gimage, 0x0101);
gimp_context_set_display (gimp_context_get_user (), gdisp);
@ -414,7 +414,7 @@ edit_clear (GImage *gimage,
if (!gimage || drawable == NULL)
return FALSE;
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
if (drawable_has_alpha (drawable))
col [drawable_bytes (drawable) - 1] = OPAQUE_OPACITY;
@ -428,8 +428,8 @@ edit_clear (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -459,11 +459,11 @@ edit_fill (GImage *gimage,
switch (fill_type)
{
case FOREGROUND_FILL:
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
break;
case BACKGROUND_FILL:
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
case WHITE_FILL:
@ -485,7 +485,7 @@ edit_fill (GImage *gimage,
default:
g_warning ("unknown fill type");
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
}
@ -499,8 +499,8 @@ edit_fill (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -517,7 +517,7 @@ global_edit_cut (GDisplay *gdisp)
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_cut (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
/* flush the display */
@ -529,7 +529,7 @@ global_edit_cut (GDisplay *gdisp)
gboolean
global_edit_copy (GDisplay *gdisp)
{
if (!edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_copy (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
return TRUE;
@ -542,7 +542,7 @@ global_edit_paste (GDisplay *gdisp,
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_paste (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
if (!edit_paste (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage),
global_buf, paste_into))
return FALSE;
@ -613,13 +613,13 @@ named_buffer_paste_foreach (GtkWidget *widget,
{
case PASTE:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, FALSE);
break;
case PASTE_INTO:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, TRUE);
break;
@ -856,7 +856,8 @@ cut_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_cut (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
gdisplays_flush ();
@ -892,7 +893,8 @@ copy_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_copy (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
}

6
app/core/gimpimagemap.c
View File

@ -25,8 +25,8 @@
#include "appenv.h"
#include "drawable.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "image_map.h"
#include "paint_funcs.h"
#include "pixel_region.h"
@ -84,8 +84,8 @@ image_map_do (gpointer data)
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimage_apply_image (gimage, _image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
gimp_image_apply_image (gimage, _image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (_image_map->gdisp)

26
app/core/gimplayer-floating-sel.c
View File

@ -28,8 +28,8 @@
#include "layer.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "paint_funcs.h"
#include "pixel_region.h"
#include "tile_manager.h"
@ -56,11 +56,11 @@ floating_sel_attach (Layer *layer,
if (gimage->floating_sel != NULL)
{
floating_sel = gimage->floating_sel;
floating_sel_anchor (gimage_floating_sel (gimage));
floating_sel_anchor (gimp_image_floating_sel (gimage));
/* if we were pasting to the old floating selection, paste now to the drawable */
if (drawable == GIMP_DRAWABLE (floating_sel))
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
}
/* set the drawable and allocate a backing store */
@ -78,7 +78,7 @@ floating_sel_attach (Layer *layer,
gimage->floating_sel = layer;
/* add the layer to the gimage */
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
/* store the affected area from the drawable in the backing store */
floating_sel_rigor (layer, TRUE);
@ -102,7 +102,7 @@ floating_sel_remove (Layer *layer)
gimp_drawable_invalidate_preview (GIMP_DRAWABLE (layer), TRUE);
/* remove the layer from the gimage */
gimage_remove_layer (gimage, layer);
gimp_image_remove_layer (gimage, layer);
}
void
@ -136,7 +136,7 @@ floating_sel_anchor (Layer *layer)
GIMP_DRAWABLE (layer)->height, TRUE);
/* remove the floating selection */
gimage_remove_layer (gimage, layer);
gimp_image_remove_layer (gimage, layer);
/* end the group undo */
undo_push_group_end (gimage);
@ -155,13 +155,13 @@ floating_sel_reset (Layer *layer)
/* set the underlying drawable to active */
if (GIMP_IS_LAYER (layer->fs.drawable))
gimage_set_active_layer (gimage, GIMP_LAYER (layer->fs.drawable));
gimp_image_set_active_layer (gimage, GIMP_LAYER (layer->fs.drawable));
else if (GIMP_IS_LAYER_MASK (layer->fs.drawable))
gimage_set_active_layer (gimage,
gimp_image_set_active_layer (gimage,
GIMP_LAYER_MASK (layer->fs.drawable)->layer);
else if (GIMP_IS_CHANNEL (layer->fs.drawable))
{
gimage_set_active_channel (gimage, GIMP_CHANNEL (layer->fs.drawable));
gimp_image_set_active_channel (gimage, GIMP_CHANNEL (layer->fs.drawable));
if (gimage->layers)
gimage->active_layer = (((Layer *) gimage->layer_stack->data));
else
@ -465,10 +465,10 @@ floating_sel_composite (Layer *layer,
/* apply the fs with the undo specified by the value
* passed to this function
*/
gimage_apply_image (gimage, layer->fs.drawable, &fsPR,
undo, layer->opacity, layer->mode,
NULL,
(x1 - offx), (y1 - offy));
gimp_image_apply_image (gimage, layer->fs.drawable, &fsPR,
undo, layer->opacity, layer->mode,
NULL,
(x1 - offx), (y1 - offy));
/* restore preserve transparency */
if (preserve_trans)

4
app/desaturate.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "desaturate.h"
#include "gimage.h"
#include "gimpimage.h"
#include "paint_funcs.h"
#include "pixel_region.h"
@ -37,7 +37,7 @@ image_desaturate (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (! drawable_color (drawable))
{

46
app/disp_callbacks.c
View File

@ -32,7 +32,7 @@
#include "dialog_handler.h"
#include "disp_callbacks.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpcontext.h"
#include "drawable.h"
#include "gimprc.h"
@ -260,7 +260,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
NULL);
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->auto_snap_to)
{
@ -275,7 +275,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
! active_tool->drawable ||
/* or a drawable different from the current one */
(gimage_active_drawable (gdisp->gimage) !=
(gimp_image_active_drawable (gdisp->gimage) !=
active_tool->drawable)) &&
/* and doesn't want to be preserved across drawable changes */
@ -287,7 +287,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
/* otherwise set it's drawable if it has none */
else if (! active_tool->drawable)
{
active_tool->drawable = gimage_active_drawable (gdisp->gimage);
active_tool->drawable =
gimp_image_active_drawable (gdisp->gimage);
}
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
@ -381,7 +382,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
gtk_grab_remove (canvas);
gdk_pointer_ungrab (bevent->time); /* fixes pointer grab bug */
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->state == ACTIVE)
{
@ -467,7 +468,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)) &&
!gimp_image_is_empty (gdisp->gimage)) &&
(mevent->state & GDK_BUTTON1_MASK))
{
if (active_tool->state == ACTIVE)
@ -527,17 +528,18 @@ gdisplay_canvas_events (GtkWidget *canvas,
{
case GDK_Left: case GDK_Right:
case GDK_Up: case GDK_Down:
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
(* active_tool->arrow_keys_func) (active_tool, kevent, gdisp);
return_val = TRUE;
break;
case GDK_Tab:
if (kevent->state & GDK_MOD1_MASK && !gimage_is_empty (gdisp->gimage))
if (kevent->state & GDK_MOD1_MASK &&
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, 1, kevent->time);
if (kevent->state & GDK_CONTROL_MASK &&
!gimage_is_empty (gdisp->gimage))
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, -1, kevent->time);
/* Hide or show all dialogs */
@ -553,7 +555,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state |= key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -584,7 +586,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state &= ~key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -617,7 +619,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (no_cursor_updating == 0)
{
if (active_tool && !gimage_is_empty (gdisp->gimage) &&
if (active_tool && !gimp_image_is_empty (gdisp->gimage) &&
!(state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
{
GdkEventMotion me;
@ -625,7 +627,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
me.state = state;
(* active_tool->cursor_update_func) (active_tool, &me, gdisp);
}
else if (gimage_is_empty (gdisp->gimage))
else if (gimp_image_is_empty (gdisp->gimage))
{
gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR,
TOOL_TYPE_NONE,
@ -820,7 +822,7 @@ gdisplay_drag_drop (GtkWidget *widget,
break;
}
gimage_get_background (src_gimage, drawable, bg);
gimp_image_get_background (src_gimage, drawable, bg);
tiles = tile_manager_new (src_width, src_height, bytes);
@ -865,7 +867,7 @@ gdisplay_drag_drop (GtkWidget *widget,
layer_translate (new_layer, off_x, off_y);
gimage_add_layer (dest_gimage, new_layer, -1);
gimp_image_add_layer (dest_gimage, new_layer, -1);
undo_push_group_end (dest_gimage);
@ -908,7 +910,7 @@ gdisplay_bucket_fill (GtkWidget *widget,
return;
gimage = ((GDisplay *) data)->gimage;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (!drawable)
return;
@ -946,8 +948,8 @@ gdisplay_bucket_fill (GtkWidget *widget,
size = orig_pat_buf->width * orig_pat_buf->height;
while (size--)
{
gimage_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
gimp_image_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
d1 += orig_pat_buf->bytes;
d2 += pat_buf->bytes;
}
@ -972,10 +974,10 @@ gdisplay_bucket_fill (GtkWidget *widget,
/* Apply it to the image */
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
tile_manager_destroy (buf_tiles);
/* Update the displays */

46
app/display/gimpdisplay-callbacks.c
View File

@ -32,7 +32,7 @@
#include "dialog_handler.h"
#include "disp_callbacks.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpcontext.h"
#include "drawable.h"
#include "gimprc.h"
@ -260,7 +260,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
NULL);
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->auto_snap_to)
{
@ -275,7 +275,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
! active_tool->drawable ||
/* or a drawable different from the current one */
(gimage_active_drawable (gdisp->gimage) !=
(gimp_image_active_drawable (gdisp->gimage) !=
active_tool->drawable)) &&
/* and doesn't want to be preserved across drawable changes */
@ -287,7 +287,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
/* otherwise set it's drawable if it has none */
else if (! active_tool->drawable)
{
active_tool->drawable = gimage_active_drawable (gdisp->gimage);
active_tool->drawable =
gimp_image_active_drawable (gdisp->gimage);
}
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
@ -381,7 +382,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
gtk_grab_remove (canvas);
gdk_pointer_ungrab (bevent->time); /* fixes pointer grab bug */
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->state == ACTIVE)
{
@ -467,7 +468,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)) &&
!gimp_image_is_empty (gdisp->gimage)) &&
(mevent->state & GDK_BUTTON1_MASK))
{
if (active_tool->state == ACTIVE)
@ -527,17 +528,18 @@ gdisplay_canvas_events (GtkWidget *canvas,
{
case GDK_Left: case GDK_Right:
case GDK_Up: case GDK_Down:
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
(* active_tool->arrow_keys_func) (active_tool, kevent, gdisp);
return_val = TRUE;
break;
case GDK_Tab:
if (kevent->state & GDK_MOD1_MASK && !gimage_is_empty (gdisp->gimage))
if (kevent->state & GDK_MOD1_MASK &&
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, 1, kevent->time);
if (kevent->state & GDK_CONTROL_MASK &&
!gimage_is_empty (gdisp->gimage))
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, -1, kevent->time);
/* Hide or show all dialogs */
@ -553,7 +555,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state |= key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -584,7 +586,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state &= ~key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -617,7 +619,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (no_cursor_updating == 0)
{
if (active_tool && !gimage_is_empty (gdisp->gimage) &&
if (active_tool && !gimp_image_is_empty (gdisp->gimage) &&
!(state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
{
GdkEventMotion me;
@ -625,7 +627,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
me.state = state;
(* active_tool->cursor_update_func) (active_tool, &me, gdisp);
}
else if (gimage_is_empty (gdisp->gimage))
else if (gimp_image_is_empty (gdisp->gimage))
{
gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR,
TOOL_TYPE_NONE,
@ -820,7 +822,7 @@ gdisplay_drag_drop (GtkWidget *widget,
break;
}
gimage_get_background (src_gimage, drawable, bg);
gimp_image_get_background (src_gimage, drawable, bg);
tiles = tile_manager_new (src_width, src_height, bytes);
@ -865,7 +867,7 @@ gdisplay_drag_drop (GtkWidget *widget,
layer_translate (new_layer, off_x, off_y);
gimage_add_layer (dest_gimage, new_layer, -1);
gimp_image_add_layer (dest_gimage, new_layer, -1);
undo_push_group_end (dest_gimage);
@ -908,7 +910,7 @@ gdisplay_bucket_fill (GtkWidget *widget,
return;
gimage = ((GDisplay *) data)->gimage;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (!drawable)
return;
@ -946,8 +948,8 @@ gdisplay_bucket_fill (GtkWidget *widget,
size = orig_pat_buf->width * orig_pat_buf->height;
while (size--)
{
gimage_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
gimp_image_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
d1 += orig_pat_buf->bytes;
d2 += pat_buf->bytes;
}
@ -972,10 +974,10 @@ gdisplay_bucket_fill (GtkWidget *widget,
/* Apply it to the image */
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
tile_manager_destroy (buf_tiles);
/* Update the displays */

4
app/display/gimpdisplay-ops.c
View File

@ -27,7 +27,7 @@
#include "cursorutil.h"
#include "fileops.h"
#include "gdisplay_ops.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpui.h"
#include "gximage.h"
#include "menus.h"
@ -135,7 +135,7 @@ gdisplay_close_window (GDisplay *gdisp,
confirm_on_close)
{
gdisplay_close_warning_dialog
(g_basename (gimage_filename (gdisp->gimage)), gdisp);
(g_basename (gimp_image_filename (gdisp->gimage)), gdisp);
}
else
{

46
app/display/gimpdisplayshell-callbacks.c
View File

@ -32,7 +32,7 @@
#include "dialog_handler.h"
#include "disp_callbacks.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpcontext.h"
#include "drawable.h"
#include "gimprc.h"
@ -260,7 +260,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
NULL);
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->auto_snap_to)
{
@ -275,7 +275,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
! active_tool->drawable ||
/* or a drawable different from the current one */
(gimage_active_drawable (gdisp->gimage) !=
(gimp_image_active_drawable (gdisp->gimage) !=
active_tool->drawable)) &&
/* and doesn't want to be preserved across drawable changes */
@ -287,7 +287,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
/* otherwise set it's drawable if it has none */
else if (! active_tool->drawable)
{
active_tool->drawable = gimage_active_drawable (gdisp->gimage);
active_tool->drawable =
gimp_image_active_drawable (gdisp->gimage);
}
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
@ -381,7 +382,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
gtk_grab_remove (canvas);
gdk_pointer_ungrab (bevent->time); /* fixes pointer grab bug */
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)))
!gimp_image_is_empty (gdisp->gimage)))
{
if (active_tool->state == ACTIVE)
{
@ -467,7 +468,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
if (active_tool && ((active_tool->type == MOVE) ||
!gimage_is_empty (gdisp->gimage)) &&
!gimp_image_is_empty (gdisp->gimage)) &&
(mevent->state & GDK_BUTTON1_MASK))
{
if (active_tool->state == ACTIVE)
@ -527,17 +528,18 @@ gdisplay_canvas_events (GtkWidget *canvas,
{
case GDK_Left: case GDK_Right:
case GDK_Up: case GDK_Down:
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
(* active_tool->arrow_keys_func) (active_tool, kevent, gdisp);
return_val = TRUE;
break;
case GDK_Tab:
if (kevent->state & GDK_MOD1_MASK && !gimage_is_empty (gdisp->gimage))
if (kevent->state & GDK_MOD1_MASK &&
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, 1, kevent->time);
if (kevent->state & GDK_CONTROL_MASK &&
!gimage_is_empty (gdisp->gimage))
!gimp_image_is_empty (gdisp->gimage))
layer_select_init (gdisp->gimage, -1, kevent->time);
/* Hide or show all dialogs */
@ -553,7 +555,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state |= key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -584,7 +586,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
case GDK_Control_L: case GDK_Control_R:
state &= ~key_to_state (kevent->keyval);
/* For all modifier keys: call the tools modifier_key_func */
if (active_tool && !gimage_is_empty (gdisp->gimage))
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
@ -617,7 +619,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (no_cursor_updating == 0)
{
if (active_tool && !gimage_is_empty (gdisp->gimage) &&
if (active_tool && !gimp_image_is_empty (gdisp->gimage) &&
!(state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
{
GdkEventMotion me;
@ -625,7 +627,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
me.state = state;
(* active_tool->cursor_update_func) (active_tool, &me, gdisp);
}
else if (gimage_is_empty (gdisp->gimage))
else if (gimp_image_is_empty (gdisp->gimage))
{
gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR,
TOOL_TYPE_NONE,
@ -820,7 +822,7 @@ gdisplay_drag_drop (GtkWidget *widget,
break;
}
gimage_get_background (src_gimage, drawable, bg);
gimp_image_get_background (src_gimage, drawable, bg);
tiles = tile_manager_new (src_width, src_height, bytes);
@ -865,7 +867,7 @@ gdisplay_drag_drop (GtkWidget *widget,
layer_translate (new_layer, off_x, off_y);
gimage_add_layer (dest_gimage, new_layer, -1);
gimp_image_add_layer (dest_gimage, new_layer, -1);
undo_push_group_end (dest_gimage);
@ -908,7 +910,7 @@ gdisplay_bucket_fill (GtkWidget *widget,
return;
gimage = ((GDisplay *) data)->gimage;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (!drawable)
return;
@ -946,8 +948,8 @@ gdisplay_bucket_fill (GtkWidget *widget,
size = orig_pat_buf->width * orig_pat_buf->height;
while (size--)
{
gimage_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
gimp_image_transform_color (gimage, drawable, d1, d2,
(orig_pat_buf->bytes == 3) ? RGB : GRAY);
d1 += orig_pat_buf->bytes;
d2 += pat_buf->bytes;
}
@ -972,10 +974,10 @@ gdisplay_bucket_fill (GtkWidget *widget,
/* Apply it to the image */
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, TRUE,
gimp_context_get_opacity (context) * 255,
gimp_context_get_paint_mode (context),
NULL, x1, y1);
tile_manager_destroy (buf_tiles);
/* Update the displays */

4
app/equalize.c
View File

@ -24,7 +24,7 @@
#include "drawable.h"
#include "equalize.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "gimphistogram.h"
@ -39,7 +39,7 @@ image_equalize (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

46
app/fileops.c
View File

@ -438,7 +438,7 @@ file_save_callback (GtkWidget *widget,
if (! gdisplay)
return;
if (! gimage_active_drawable (gdisplay->gimage))
if (! gimp_image_active_drawable (gdisplay->gimage))
return;
/* Only save if the gimage has been modified */
@ -454,7 +454,7 @@ file_save_callback (GtkWidget *widget,
gchar *raw_filename;
gint status;
filename = g_strdup (gimage_filename (gdisplay->gimage));
filename = g_strdup (gimp_image_filename (gdisplay->gimage));
raw_filename = g_basename (filename);
status = file_save (gdisplay->gimage,
@ -483,7 +483,7 @@ file_save_as_callback (GtkWidget *widget,
if (! gdisplay)
return;
if (! gimage_active_drawable (gdisplay->gimage))
if (! gimp_image_active_drawable (gdisplay->gimage))
return;
the_gimage = gdisplay->gimage;
@ -527,7 +527,7 @@ file_save_as_callback (GtkWidget *widget,
gtk_file_selection_set_filename (GTK_FILE_SELECTION(filesave),
gdisplay->gimage->has_filename
? gimage_filename(gdisplay->gimage)
? gimp_image_filename (gdisplay->gimage)
: "." G_DIR_SEPARATOR_S);
if (!save_options)
{
@ -566,7 +566,7 @@ file_save_as_callback (GtkWidget *widget,
save_options, FALSE, FALSE, 0);
}
switch (gimp_drawable_type (gimage_active_drawable (gdisplay->gimage)))
switch (gimp_drawable_type (gimp_image_active_drawable (gdisplay->gimage)))
{
case RGB_GIMAGE:
file_update_menus (save_procs, PLUG_IN_RGB_IMAGE);
@ -626,8 +626,8 @@ file_revert_callback (GtkWidget *widget,
"%s\n\n"
"(You will loose all your changes\n"
"including all undo information)"),
g_basename (gimage_filename (gimage)),
gimage_filename (gimage));
g_basename (gimp_image_filename (gimage)),
gimp_image_filename (gimage));
query_box = gimp_query_boolean_box (_("Revert Image?"),
gimp_standard_help_func,
@ -721,12 +721,12 @@ file_open_image (const gchar *filename,
gint *status)
{
PlugInProcDef *file_proc;
ProcRecord *proc;
Argument *args;
Argument *return_vals;
gint gimage_id;
gint i;
struct stat statbuf;
ProcRecord *proc;
Argument *args;
Argument *return_vals;
gint gimage_id;
gint i;
struct stat statbuf;
*status = PDB_CANCEL; /* inhibits error messages by caller */
@ -806,7 +806,7 @@ file_open_image (const gchar *filename,
if (*status == PDB_SUCCESS && gimage_id != -1)
{
GimpImage *gimage = gimage_get_ID (gimage_id);
GimpImage *gimage = pdb_id_to_image (gimage_id);
if (gimage)
{
@ -836,10 +836,10 @@ file_open (gchar *filename,
&status)) != NULL)
{
/* enable & clear all undo steps */
gimage_enable_undo (gimage);
gimp_image_undo_enable (gimage);
/* set the image to clean */
gimage_clean_all (gimage);
gimp_image_clean_all (gimage);
/* display the image */
gdisplay = gdisplay_new (gimage, 0x0101);
@ -1132,10 +1132,10 @@ file_save (GimpImage *gimage,
gint i;
struct stat statbuf;
if (gimage_active_drawable (gimage) == NULL)
if (gimp_image_active_drawable (gimage) == NULL)
return PDB_EXECUTION_ERROR;
file_proc = gimage_get_save_proc (gimage);
file_proc = gimp_image_get_save_proc (gimage);
if (!file_proc)
file_proc = file_proc_find (save_procs, raw_filename);
@ -1196,7 +1196,7 @@ file_save (GimpImage *gimage,
args[0].value.pdb_int = run_mode;
args[1].value.pdb_int = pdb_image_to_id (gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gimage));
args[3].value.pdb_pointer = filename;
args[4].value.pdb_pointer = raw_filename;
@ -1207,7 +1207,7 @@ file_save (GimpImage *gimage,
if (status == PDB_SUCCESS)
{
/* set this image to clean */
gimage_clean_all (gimage);
gimp_image_clean_all (gimage);
/* these calls must come before the call to gimage_set_filename */
document_index_add (filename);
@ -1557,7 +1557,7 @@ file_open_genbutton_callback (GtkWidget *widget,
if (thumbnail_mode)
{
file_save_thumbnail (gimage_to_be_thumbed,
full_filename, tempbuf);
full_filename, tempbuf);
}
set_preview (full_filename, RGBbuf, RGBbuf_w, RGBbuf_h);
@ -1749,7 +1749,7 @@ file_save_with_proc (GImage *gimage,
if (gimage != NULL)
{
gimage_set_save_proc (gimage, save_proc);
gimp_image_set_save_proc (gimage, save_proc);
status = file_save (gimage,
full_filename,
raw_filename,
@ -1955,7 +1955,7 @@ file_revert_confirm_callback (GtkWidget *widget,
const gchar *filename;
gint status;
filename = gimage_filename (old_gimage);
filename = gimp_image_filename (old_gimage);
new_gimage = file_open_image (filename, filename, _("Revert"),
RUN_INTERACTIVE, &status);

26
app/floating_sel.c
View File

@ -28,8 +28,8 @@
#include "layer.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "paint_funcs.h"
#include "pixel_region.h"
#include "tile_manager.h"
@ -56,11 +56,11 @@ floating_sel_attach (Layer *layer,
if (gimage->floating_sel != NULL)
{
floating_sel = gimage->floating_sel;
floating_sel_anchor (gimage_floating_sel (gimage));
floating_sel_anchor (gimp_image_floating_sel (gimage));
/* if we were pasting to the old floating selection, paste now to the drawable */
if (drawable == GIMP_DRAWABLE (floating_sel))
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
}
/* set the drawable and allocate a backing store */
@ -78,7 +78,7 @@ floating_sel_attach (Layer *layer,
gimage->floating_sel = layer;
/* add the layer to the gimage */
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
/* store the affected area from the drawable in the backing store */
floating_sel_rigor (layer, TRUE);
@ -102,7 +102,7 @@ floating_sel_remove (Layer *layer)
gimp_drawable_invalidate_preview (GIMP_DRAWABLE (layer), TRUE);
/* remove the layer from the gimage */
gimage_remove_layer (gimage, layer);
gimp_image_remove_layer (gimage, layer);
}
void
@ -136,7 +136,7 @@ floating_sel_anchor (Layer *layer)
GIMP_DRAWABLE (layer)->height, TRUE);
/* remove the floating selection */
gimage_remove_layer (gimage, layer);
gimp_image_remove_layer (gimage, layer);
/* end the group undo */
undo_push_group_end (gimage);
@ -155,13 +155,13 @@ floating_sel_reset (Layer *layer)
/* set the underlying drawable to active */
if (GIMP_IS_LAYER (layer->fs.drawable))
gimage_set_active_layer (gimage, GIMP_LAYER (layer->fs.drawable));
gimp_image_set_active_layer (gimage, GIMP_LAYER (layer->fs.drawable));
else if (GIMP_IS_LAYER_MASK (layer->fs.drawable))
gimage_set_active_layer (gimage,
gimp_image_set_active_layer (gimage,
GIMP_LAYER_MASK (layer->fs.drawable)->layer);
else if (GIMP_IS_CHANNEL (layer->fs.drawable))
{
gimage_set_active_channel (gimage, GIMP_CHANNEL (layer->fs.drawable));
gimp_image_set_active_channel (gimage, GIMP_CHANNEL (layer->fs.drawable));
if (gimage->layers)
gimage->active_layer = (((Layer *) gimage->layer_stack->data));
else
@ -465,10 +465,10 @@ floating_sel_composite (Layer *layer,
/* apply the fs with the undo specified by the value
* passed to this function
*/
gimage_apply_image (gimage, layer->fs.drawable, &fsPR,
undo, layer->opacity, layer->mode,
NULL,
(x1 - offx), (y1 - offy));
gimp_image_apply_image (gimage, layer->fs.drawable, &fsPR,
undo, layer->opacity, layer->mode,
NULL,
(x1 - offx), (y1 - offy));
/* restore preserve transparency */
if (preserve_trans)

4
app/gdisplay_ops.c
View File

@ -27,7 +27,7 @@
#include "cursorutil.h"
#include "fileops.h"
#include "gdisplay_ops.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpui.h"
#include "gximage.h"
#include "menus.h"
@ -135,7 +135,7 @@ gdisplay_close_window (GDisplay *gdisp,
confirm_on_close)
{
gdisplay_close_warning_dialog
(g_basename (gimage_filename (gdisp->gimage)), gdisp);
(g_basename (gimp_image_filename (gdisp->gimage)), gdisp);
}
else
{

24
app/gimage.c
View File

@ -90,12 +90,6 @@ gimage_new (gint width,
return gimage;
}
GImage *
gimage_get_ID (gint ID)
{
return pdb_id_to_image (ID);
}
/* Ack, GImages have their own ref counts! This is going to cause
trouble.. It should be pretty easy to convert to proper GtkObject
@ -144,11 +138,12 @@ gimage_dirty_handler (GimpImage *gimage)
}
static void
gimlist_cb (gpointer im,
gimlist_cb (gpointer image,
gpointer data)
{
GSList** l=(GSList**)data;
*l=g_slist_prepend(*l, im);
GSList **list = (GSList **) data;
*list = g_slist_prepend (*list, image);
}
gint
@ -162,7 +157,7 @@ gimage_image_count (void)
g_slist_free (list);
return (num_images);
return num_images;
}
static void
@ -174,12 +169,11 @@ gimage_destroy_handler (GimpImage *gimage)
undo_free (gimage);
/* free all guides */
list = gimage->guides;
while (list)
for (list = gimage->guides; list; list = g_list_next (list))
{
g_free ((Guide*) list->data);
list = g_list_next (list);
}
g_list_free (gimage->guides);
if (gimage_image_count () == 1) /* This is the last image */
@ -223,7 +217,7 @@ gimage_resize_handler (GimpImage *gimage)
}
static void
gimage_restructure_handler (GimpImage* gimage)
gimage_restructure_handler (GimpImage *gimage)
{
gdisplays_update_title (gimage);
}
@ -277,7 +271,7 @@ void
gimage_set_layer_mask_show (GImage *gimage,
GimpLayer *layer)
{
int off_x, off_y;
gint off_x, off_y;
g_return_if_fail (gimage);
g_return_if_fail (layer);

115
app/gimage.h
View File

@ -19,108 +19,27 @@
#ifndef __GIMAGE_H__
#define __GIMAGE_H__
#include "gimpimage.h"
GImage* gimage_new (gint width,
gint height,
GimpImageBaseType base_type);
GImage* gimage_get_ID (gint ID);
void gimage_delete (GImage *gimage);
void gimage_invalidate_previews (void);
void gimage_set_layer_mask_apply (GImage *gimage,
GimpLayer *layer);
void gimage_set_layer_mask_edit (GImage *gimage,
GimpLayer *layer,
gboolean edit);
void gimage_set_layer_mask_show (GImage *gimage,
GimpLayer *layer);
void gimage_foreach (GFunc func,
gpointer user_data);
#define gimage_set_filename gimp_image_set_filename
#define gimage_set_resolution gimp_image_set_resolution
#define gimage_get_resolution gimp_image_get_resolution
#define gimage_set_unit gimp_image_set_unit
#define gimage_get_unit gimp_image_get_unit
#define gimage_set_save_proc gimp_image_set_save_proc
#define gimage_get_save_proc gimp_image_get_save_proc
#define gimage_resize gimp_image_resize
#define gimage_scale gimp_image_scale
#define gimage_shadow gimp_image_shadow
#define gimage_free_shadow gimp_image_free_shadow
#define gimage_apply_image gimp_image_apply_image
#define gimage_replace_image gimp_image_replace_image
#define gimage_get_foreground gimp_image_get_foreground
#define gimage_get_background gimp_image_get_background
#define gimage_get_color gimp_image_get_color
#define gimage_transform_color gimp_image_transform_color
#define gimage_add_hguide gimp_image_add_hguide
#define gimage_add_vguide gimp_image_add_vguide
#define gimage_add_guide gimp_image_add_guide
#define gimage_remove_guide gimp_image_remove_guide
#define gimage_delete_guide gimp_image_delete_guide
#define gimage_get_layer_index gimp_image_get_layer_index
#define gimage_get_layer_by_index gimp_image_get_layer_by_index
#define gimage_get_channel_index gimp_image_get_channel_index
#define gimage_get_active_layer gimp_image_get_active_layer
#define gimage_get_active_channel gimp_image_get_active_channel
#define gimage_get_mask gimp_image_get_mask
#define gimage_get_component_active gimp_image_get_component_active
#define gimage_get_component_visible gimp_image_get_component_visible
#define gimage_layer_boundary gimp_image_layer_boundary
#define gimage_set_active_layer gimp_image_set_active_layer
#define gimage_set_active_channel gimp_image_set_active_channel
#define gimage_unset_active_channel gimp_image_unset_active_channel
#define gimage_set_component_active gimp_image_set_component_active
#define gimage_set_component_visible gimp_image_set_component_visible
#define gimage_pick_correlate_layer gimp_image_pick_correlate_layer
#define gimage_raise_layer gimp_image_raise_layer
#define gimage_lower_layer gimp_image_lower_layer
#define gimage_raise_layer_to_top gimp_image_raise_layer_to_top
#define gimage_lower_layer_to_bottom gimp_image_lower_layer_to_bottom
#define gimage_position_layer gimp_image_position_layer
#define gimage_merge_visible_layers gimp_image_merge_visible_layers
#define gimage_flatten gimp_image_flatten
#define gimage_merge_layers gimp_image_merge_layers
#define gimage_add_layer gimp_image_add_layer
#define gimage_remove_layer gimp_image_remove_layer
#define gimage_add_layer_mask gimp_image_add_layer_mask
#define gimage_remove_layer_mask gimp_image_remove_layer_mask
#define gimage_raise_channel gimp_image_raise_channel
#define gimage_lower_channel gimp_image_lower_channel
#define gimage_position_channel gimp_image_position_channel
#define gimage_add_channel gimp_image_add_channel
#define gimage_remove_channel gimp_image_remove_channel
#define gimage_construct gimp_image_construct
#define gimage_invalidate_without_render gimp_image_invalidate_without_render
#define gimage_invalidate gimp_image_invalidate
#define gimage_validate gimp_image_validate
#define gimage_is_empty gimp_image_is_empty
#define gimage_active_drawable gimp_image_active_drawable
#define gimage_base_type gimp_image_base_type
#define gimage_base_type_with_alpha gimp_image_base_type_with_alpha
#define gimage_filename gimp_image_filename
#define gimage_enable_undo gimp_image_undo_enable
#define gimage_disable_undo gimp_image_undo_disable
#define gimage_thaw_undo gimp_image_undo_thaw
#define gimage_freeze_undo gimp_image_undo_freeze
#define gimage_dirty gimp_image_dirty
#define gimage_clean gimp_image_clean
#define gimage_clean_all gimp_image_clean_all
#define gimage_floating_sel gimp_image_floating_sel
#define gimage_cmap gimp_image_cmap
#define gimage_projection gimp_image_projection
#define gimage_projection_type gimp_image_projection_type
#define gimage_projection_bytes gimp_image_projection_bytes
#define gimage_projection_opacity gimp_image_projection_opacity
#define gimage_projection_realloc gimp_image_projection_realloc
#define gimage_composite gimp_image_composite
#define gimage_composite_type gimp_image_composite_type
#define gimage_composite_bytes gimp_image_composite_bytes
#define gimage_composite_preview gimp_image_composite_preview
#define gimage_preview_valid gimp_image_preview_valid
#define gimage_invalidate_preview gimp_image_invalidate_preview
GImage * gimage_new (gint width,
gint height,
GimpImageBaseType base_type);
void gimage_delete (GImage *gimage);
void gimage_invalidate_previews (void);
void gimage_set_layer_mask_apply (GImage *gimage,
GimpLayer *layer);
void gimage_set_layer_mask_edit (GImage *gimage,
GimpLayer *layer,
gboolean edit);
void gimage_set_layer_mask_show (GImage *gimage,
GimpLayer *layer);
void gimage_foreach (GFunc func,
gpointer user_data);
extern guint32 next_guide_id;
#endif /* __GIMAGE_H__ */

4
app/gimpdrawable-desaturate.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "desaturate.h"
#include "gimage.h"
#include "gimpimage.h"
#include "paint_funcs.h"
#include "pixel_region.h"
@ -37,7 +37,7 @@ image_desaturate (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (! drawable_color (drawable))
{

4
app/gimpdrawable-equalize.c
View File

@ -24,7 +24,7 @@
#include "drawable.h"
#include "equalize.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "gimphistogram.h"
@ -39,7 +39,7 @@ image_equalize (GimpImage *gimage)
{
GimpDrawable *drawable;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

4
app/gimpdrawable-invert.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "invert.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "pixel_processor.h"
@ -42,7 +42,7 @@ image_invert (GimpImage *gimage)
Argument *return_vals;
gint nreturn_vals;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

12
app/gimpdrawable.c
View File

@ -31,8 +31,8 @@
#include "layer.h"
#include "gimppreviewcache.h"
#include "gimpsignal.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "gimpparasite.h"
#include "paint_funcs.h"
#include "parasitelist.h"
@ -153,8 +153,8 @@ gimp_drawable_merge_shadow (GimpDrawable *drawable,
gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
pixel_region_init (&shadowPR, gimage->shadow, x1, y1,
(x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &shadowPR, undo, OPAQUE_OPACITY,
REPLACE_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &shadowPR, undo, OPAQUE_OPACITY,
REPLACE_MODE, NULL, x1, y1);
}
void
@ -196,7 +196,7 @@ gimp_drawable_fill (GimpDrawable *drawable,
c[RED_PIX] = r;
c[GREEN_PIX] = g;
c[BLUE_PIX] = b;
gimage_transform_color (gimage, drawable, c, &i, RGB);
gimp_image_transform_color (gimage, drawable, c, &i, RGB);
c[INDEXED_PIX] = i;
if (gimp_drawable_type (drawable) == INDEXEDA_GIMAGE)
c[ALPHA_I_PIX] = a;
@ -660,8 +660,8 @@ gimp_drawable_shadow (GimpDrawable *drawable)
if (! (gimage = gimp_drawable_gimage (drawable)))
return NULL;
return gimage_shadow (gimage, drawable->width, drawable->height,
drawable->bytes);
return gimp_image_shadow (gimage, drawable->width, drawable->height,
drawable->bytes);
}
int

42
app/global_edit.c
View File

@ -340,7 +340,7 @@ edit_paste (GImage *gimage,
* it seems like the correct behavior.
*/
if (! gimage_mask_is_empty (gimage) && !paste_into)
channel_clear (gimage_get_mask (gimage));
channel_clear (gimp_image_get_mask (gimage));
/* if there's a drawable, add a new floating selection */
if (drawable != NULL)
@ -350,7 +350,7 @@ edit_paste (GImage *gimage,
else
{
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
}
/* end the group undo */
@ -375,7 +375,7 @@ edit_paste_as_new (GImage *invoke,
/* create a new image (always of type RGB) */
gimage = gimage_new (paste->width, paste->height, RGB);
gimage_disable_undo (gimage);
gimp_image_undo_disable (gimage);
gimp_image_set_resolution (gimage, invoke->xresolution, invoke->yresolution);
gimp_image_set_unit (gimage, invoke->unit);
@ -389,9 +389,9 @@ edit_paste_as_new (GImage *invoke,
{
/* add the new layer to the image */
gimp_drawable_set_gimage (GIMP_DRAWABLE (layer), gimage);
gimage_add_layer (gimage, layer, 0);
gimp_image_add_layer (gimage, layer, 0);
gimage_enable_undo (gimage);
gimp_image_undo_enable (gimage);
gdisp = gdisplay_new (gimage, 0x0101);
gimp_context_set_display (gimp_context_get_user (), gdisp);
@ -414,7 +414,7 @@ edit_clear (GImage *gimage,
if (!gimage || drawable == NULL)
return FALSE;
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
if (drawable_has_alpha (drawable))
col [drawable_bytes (drawable) - 1] = OPAQUE_OPACITY;
@ -428,8 +428,8 @@ edit_clear (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
ERASE_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -459,11 +459,11 @@ edit_fill (GImage *gimage,
switch (fill_type)
{
case FOREGROUND_FILL:
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
break;
case BACKGROUND_FILL:
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
case WHITE_FILL:
@ -485,7 +485,7 @@ edit_fill (GImage *gimage,
default:
g_warning ("unknown fill type");
gimage_get_background (gimage, drawable, col);
gimp_image_get_background (gimage, drawable, col);
break;
}
@ -499,8 +499,8 @@ edit_fill (GImage *gimage,
color_region (&bufPR, col);
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimage_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
gimp_image_apply_image (gimage, drawable, &bufPR, 1, OPAQUE_OPACITY,
NORMAL_MODE, NULL, x1, y1);
/* update the image */
drawable_update (drawable, x1, y1, (x2 - x1), (y2 - y1));
@ -517,7 +517,7 @@ global_edit_cut (GDisplay *gdisp)
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_cut (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
/* flush the display */
@ -529,7 +529,7 @@ global_edit_cut (GDisplay *gdisp)
gboolean
global_edit_copy (GDisplay *gdisp)
{
if (!edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage)))
if (!edit_copy (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage)))
return FALSE;
return TRUE;
@ -542,7 +542,7 @@ global_edit_paste (GDisplay *gdisp,
/* stop any active tool */
active_tool_control (HALT, gdisp);
if (!edit_paste (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
if (!edit_paste (gdisp->gimage, gimp_image_active_drawable (gdisp->gimage),
global_buf, paste_into))
return FALSE;
@ -613,13 +613,13 @@ named_buffer_paste_foreach (GtkWidget *widget,
{
case PASTE:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, FALSE);
break;
case PASTE_INTO:
edit_paste (pn_dlg->gdisp->gimage,
gimage_active_drawable (pn_dlg->gdisp->gimage),
gimp_image_active_drawable (pn_dlg->gdisp->gimage),
nb->buf, TRUE);
break;
@ -856,7 +856,8 @@ cut_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_cut (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_cut (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
gdisplays_flush ();
@ -892,7 +893,8 @@ copy_named_buffer_callback (GtkWidget *widget,
gdisp = (GDisplay *) data;
new_tiles = edit_copy (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
new_tiles = edit_copy (gdisp->gimage,
gimp_image_active_drawable (gdisp->gimage));
if (new_tiles)
new_named_buffer (new_tiles, name);
}

7
app/gui/paths-dialog.c
View File

@ -33,7 +33,6 @@
#include "draw_core.h"
#include "drawable.h"
#include "floating_sel.h"
#include "gimage.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimpdrawable.h"
@ -1329,10 +1328,10 @@ paths_dialog_advanced_to_path_callback (GtkWidget *widget,
args[1].arg_type = PDB_IMAGE;
args[1].value.pdb_int = (gint32) pdb_image_to_id (gimage);
args[2].arg_type = PDB_DRAWABLE;
args[2].value.pdb_int = (gint32) (gimage_active_drawable (gimage))->ID;
args[2].value.pdb_int = (gint32) (gimp_image_active_drawable (gimage))->ID;
plug_in_run (proc_rec, args, 3, FALSE, TRUE,
(gimage_active_drawable (gimage))->ID);
(gimp_image_active_drawable (gimage))->ID);
g_free (args);
@ -1370,7 +1369,7 @@ paths_dialog_sel_to_path_callback (GtkWidget *widget,
args[1].arg_type = PDB_IMAGE;
args[1].value.pdb_int = (gint32) pdb_image_to_id (gimage);
args[2].arg_type = PDB_DRAWABLE;
args[2].value.pdb_int = (gint32) (gimage_active_drawable (gimage))->ID;
args[2].value.pdb_int = (gint32) (gimp_image_active_drawable (gimage))->ID;
/* get the display by asking the current context */
gdisp = gimp_context_get_display (gimp_context_get_user ());

8
app/gui/plug-in-commands.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/gui/plug-in-menus.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

110
app/image_cmds.c
View File

@ -337,7 +337,7 @@ image_resize_invoker (Argument *args)
if (success)
{
gimp_add_busy_cursors_until_idle ();
gimage_resize (gimage, new_width, new_height, offx, offy);
gimp_image_resize (gimage, new_width, new_height, offx, offy);
}
return procedural_db_return_args (&image_resize_proc, success);
@ -411,7 +411,7 @@ image_scale_invoker (Argument *args)
if (success)
{
gimp_add_busy_cursors_until_idle ();
gimage_scale (gimage, new_width, new_height);
gimp_image_scale (gimage, new_width, new_height);
}
return procedural_db_return_args (&image_scale_proc, success);
@ -504,7 +504,7 @@ image_free_shadow_invoker (Argument *args)
success = FALSE;
if (success)
gimage_free_shadow (gimage);
gimp_image_free_shadow (gimage);
return procedural_db_return_args (&image_free_shadow_proc, success);
}
@ -701,7 +701,7 @@ image_unset_active_channel_invoker (Argument *args)
success = FALSE;
if (success)
gimage_unset_active_channel (gimage);
gimp_image_unset_active_channel (gimage);
return procedural_db_return_args (&image_unset_active_channel_proc, success);
}
@ -750,7 +750,7 @@ image_pick_correlate_layer_invoker (Argument *args)
y = args[2].value.pdb_int;
if (success)
layer = gimage_pick_correlate_layer (gimage, x, y);
layer = gimp_image_pick_correlate_layer (gimage, x, y);
return_args = procedural_db_return_args (&image_pick_correlate_layer_proc, success);
@ -820,7 +820,7 @@ image_raise_layer_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_raise_layer (gimage, layer) != NULL;
success = gimp_image_raise_layer (gimage, layer) != NULL;
return procedural_db_return_args (&image_raise_layer_proc, success);
}
@ -871,7 +871,7 @@ image_lower_layer_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_lower_layer (gimage, layer) != NULL;
success = gimp_image_lower_layer (gimage, layer) != NULL;
return procedural_db_return_args (&image_lower_layer_proc, success);
}
@ -922,7 +922,7 @@ image_raise_layer_to_top_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_raise_layer_to_top (gimage, layer) != NULL;
success = gimp_image_raise_layer_to_top (gimage, layer) != NULL;
return procedural_db_return_args (&image_raise_layer_to_top_proc, success);
}
@ -973,7 +973,7 @@ image_lower_layer_to_bottom_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_lower_layer_to_bottom (gimage, layer) != NULL;
success = gimp_image_lower_layer_to_bottom (gimage, layer) != NULL;
return procedural_db_return_args (&image_lower_layer_to_bottom_proc, success);
}
@ -1027,7 +1027,7 @@ image_merge_visible_layers_invoker (Argument *args)
if (success)
{
layer = gimage_merge_visible_layers (gimage, merge_type);
layer = gimp_image_merge_visible_layers (gimage, merge_type);
success = layer != NULL;
}
@ -1171,7 +1171,7 @@ image_flatten_invoker (Argument *args)
success = FALSE;
if (success)
success = (layer = gimage_flatten (gimage)) != NULL;
success = (layer = gimp_image_flatten (gimage)) != NULL;
return_args = procedural_db_return_args (&image_flatten_proc, success);
@ -1235,12 +1235,12 @@ image_add_layer_invoker (Argument *args)
if (success)
{
if ((drawable_color (GIMP_DRAWABLE (layer)) && gimage_base_type (gimage) != RGB) ||
(drawable_gray (GIMP_DRAWABLE (layer)) && gimage_base_type (gimage) != GRAY) ||
(drawable_indexed (GIMP_DRAWABLE (layer)) && gimage_base_type (gimage) != INDEXED))
if ((drawable_color (GIMP_DRAWABLE (layer)) && gimp_image_base_type (gimage) != RGB) ||
(drawable_gray (GIMP_DRAWABLE (layer)) && gimp_image_base_type (gimage) != GRAY) ||
(drawable_indexed (GIMP_DRAWABLE (layer)) && gimp_image_base_type (gimage) != INDEXED))
success = FALSE;
else
success = gimage_add_layer (gimage, layer, MAX (position, -1)) != NULL;
success = gimp_image_add_layer (gimage, layer, MAX (position, -1)) != NULL;
}
return procedural_db_return_args (&image_add_layer_proc, success);
@ -1297,7 +1297,7 @@ image_remove_layer_invoker (Argument *args)
success = FALSE;
if (success)
gimage_remove_layer (gimage, layer);
gimp_image_remove_layer (gimage, layer);
return procedural_db_return_args (&image_remove_layer_proc, success);
}
@ -1353,7 +1353,7 @@ image_add_layer_mask_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_add_layer_mask (gimage, layer, mask) != NULL;
success = gimp_image_add_layer_mask (gimage, layer, mask) != NULL;
return procedural_db_return_args (&image_add_layer_mask_proc, success);
}
@ -1414,7 +1414,7 @@ image_remove_layer_mask_invoker (Argument *args)
success = FALSE;
if (success)
gimage_remove_layer_mask (gimage, layer, mode);
gimp_image_remove_layer_mask (gimage, layer, mode);
return procedural_db_return_args (&image_remove_layer_mask_proc, success);
}
@ -1470,7 +1470,7 @@ image_raise_channel_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_raise_channel (gimage, channel) != NULL;
success = gimp_image_raise_channel (gimage, channel) != NULL;
return procedural_db_return_args (&image_raise_channel_proc, success);
}
@ -1521,7 +1521,7 @@ image_lower_channel_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_lower_layer (gimage, layer) != NULL;
success = gimp_image_lower_layer (gimage, layer) != NULL;
return procedural_db_return_args (&image_lower_channel_proc, success);
}
@ -1575,7 +1575,7 @@ image_add_channel_invoker (Argument *args)
position = args[2].value.pdb_int;
if (success)
success = gimage_add_channel (gimage, channel, MAX (position, -1)) != NULL;
success = gimp_image_add_channel (gimage, channel, MAX (position, -1)) != NULL;
return procedural_db_return_args (&image_add_channel_proc, success);
}
@ -1631,7 +1631,7 @@ image_remove_channel_invoker (Argument *args)
success = FALSE;
if (success)
gimage_remove_channel (gimage, channel);
gimp_image_remove_channel (gimage, channel);
return procedural_db_return_args (&image_remove_channel_proc, success);
}
@ -1679,7 +1679,7 @@ image_active_drawable_invoker (Argument *args)
success = FALSE;
if (success)
success = (drawable = gimage_active_drawable (gimage)) != NULL;
success = (drawable = gimp_image_active_drawable (gimage)) != NULL;
return_args = procedural_db_return_args (&image_active_drawable_proc, success);
@ -1736,7 +1736,7 @@ image_base_type_invoker (Argument *args)
success = FALSE;
if (success)
base_type = gimage_base_type (gimage);
base_type = gimp_image_base_type (gimage);
return_args = procedural_db_return_args (&image_base_type_proc, success);
@ -1797,7 +1797,7 @@ image_get_cmap_invoker (Argument *args)
{
num_bytes = gimage->num_cols * 3;
cmap = g_new (guint8, num_bytes);
memcpy (cmap, gimage_cmap (gimage), num_bytes);
memcpy (cmap, gimp_image_cmap (gimage), num_bytes);
}
return_args = procedural_db_return_args (&image_get_cmap_proc, success);
@ -1993,7 +1993,7 @@ image_undo_enable_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_enable_undo (gimage);
success = gimp_image_undo_enable (gimage);
return_args = procedural_db_return_args (&image_undo_enable_proc, success);
@ -2049,7 +2049,7 @@ image_undo_disable_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_disable_undo (gimage);
success = gimp_image_undo_disable (gimage);
return_args = procedural_db_return_args (&image_undo_disable_proc, success);
@ -2105,7 +2105,7 @@ image_undo_freeze_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_freeze_undo (gimage);
success = gimp_image_undo_freeze (gimage);
return_args = procedural_db_return_args (&image_undo_freeze_proc, success);
@ -2161,7 +2161,7 @@ image_undo_thaw_invoker (Argument *args)
success = FALSE;
if (success)
success = gimage_thaw_undo (gimage);
success = gimp_image_undo_thaw (gimage);
return_args = procedural_db_return_args (&image_undo_thaw_proc, success);
@ -2216,7 +2216,7 @@ image_clean_all_invoker (Argument *args)
success = FALSE;
if (success)
gimage_clean_all (gimage);
gimp_image_clean_all (gimage);
return procedural_db_return_args (&image_clean_all_proc, success);
}
@ -2259,7 +2259,7 @@ image_floating_selection_invoker (Argument *args)
success = FALSE;
if (success)
floating_sel = gimage_floating_sel (gimage);
floating_sel = gimp_image_floating_sel (gimage);
return_args = procedural_db_return_args (&image_floating_selection_proc, success);
@ -2318,7 +2318,7 @@ image_floating_sel_attached_to_invoker (Argument *args)
if (success)
{
floating_sel = gimage_floating_sel (gimage);
floating_sel = gimp_image_floating_sel (gimage);
if (floating_sel)
drawable = GIMP_DRAWABLE (GIMP_LAYER (floating_sel)->fs.drawable);
@ -2730,7 +2730,7 @@ image_get_active_layer_invoker (Argument *args)
success = FALSE;
if (success)
active_layer = gimage_get_active_layer (gimage);
active_layer = gimp_image_get_active_layer (gimage);
return_args = procedural_db_return_args (&image_get_active_layer_proc, success);
@ -2790,7 +2790,7 @@ image_set_active_layer_invoker (Argument *args)
success = FALSE;
if (success)
gimage_set_active_layer (gimage, active_layer);
gimp_image_set_active_layer (gimage, active_layer);
return procedural_db_return_args (&image_set_active_layer_proc, success);
}
@ -2838,7 +2838,7 @@ image_get_active_channel_invoker (Argument *args)
success = FALSE;
if (success)
active_channel = gimage_get_active_channel (gimage);
active_channel = gimp_image_get_active_channel (gimage);
return_args = procedural_db_return_args (&image_get_active_channel_proc, success);
@ -2898,7 +2898,7 @@ image_set_active_channel_invoker (Argument *args)
success = FALSE;
if (success)
gimage_set_active_channel (gimage, active_channel);
gimp_image_set_active_channel (gimage, active_channel);
return procedural_db_return_args (&image_set_active_channel_proc, success);
}
@ -2946,7 +2946,7 @@ image_get_selection_invoker (Argument *args)
success = FALSE;
if (success)
success = (selection = gimage_get_mask (gimage)) != NULL;
success = (selection = gimp_image_get_mask (gimage)) != NULL;
return_args = procedural_db_return_args (&image_get_selection_proc, success);
@ -3009,17 +3009,17 @@ image_get_component_active_invoker (Argument *args)
if (success)
{
if (component == GRAY_CHANNEL)
success = gimage_base_type (gimage) == GRAY;
success = gimp_image_base_type (gimage) == GRAY;
else if (component == INDEXED_CHANNEL)
success = gimage_base_type (gimage) == INDEXED;
success = gimp_image_base_type (gimage) == INDEXED;
else
success = gimage_base_type (gimage) == RGB;
success = gimp_image_base_type (gimage) == RGB;
}
return_args = procedural_db_return_args (&image_get_component_active_proc, success);
if (success)
return_args[1].value.pdb_int = gimage_get_component_active (gimage, component);
return_args[1].value.pdb_int = gimp_image_get_component_active (gimage, component);
return return_args;
}
@ -3084,14 +3084,14 @@ image_set_component_active_invoker (Argument *args)
if (success)
{
if (component == GRAY_CHANNEL)
success = gimage_base_type (gimage) == GRAY;
success = gimp_image_base_type (gimage) == GRAY;
else if (component == INDEXED_CHANNEL)
success = gimage_base_type (gimage) == INDEXED;
success = gimp_image_base_type (gimage) == INDEXED;
else
success = gimage_base_type (gimage) == RGB;
success = gimp_image_base_type (gimage) == RGB;
if (success)
gimage_set_component_active (gimage, component, active);
gimp_image_set_component_active (gimage, component, active);
}
return procedural_db_return_args (&image_set_component_active_proc, success);
@ -3151,17 +3151,17 @@ image_get_component_visible_invoker (Argument *args)
if (success)
{
if (component == GRAY_CHANNEL)
success = gimage_base_type (gimage) == GRAY;
success = gimp_image_base_type (gimage) == GRAY;
else if (component == INDEXED_CHANNEL)
success = gimage_base_type (gimage) == INDEXED;
success = gimp_image_base_type (gimage) == INDEXED;
else
success = gimage_base_type (gimage) == RGB;
success = gimp_image_base_type (gimage) == RGB;
}
return_args = procedural_db_return_args (&image_get_component_visible_proc, success);
if (success)
return_args[1].value.pdb_int = gimage_get_component_visible (gimage, component);
return_args[1].value.pdb_int = gimp_image_get_component_visible (gimage, component);
return return_args;
}
@ -3226,14 +3226,14 @@ image_set_component_visible_invoker (Argument *args)
if (success)
{
if (component == GRAY_CHANNEL)
success = gimage_base_type (gimage) == GRAY;
success = gimp_image_base_type (gimage) == GRAY;
else if (component == INDEXED_CHANNEL)
success = gimage_base_type (gimage) == INDEXED;
success = gimp_image_base_type (gimage) == INDEXED;
else
success = gimage_base_type (gimage) == RGB;
success = gimp_image_base_type (gimage) == RGB;
if (success)
gimage_set_component_visible (gimage, component, visible);
gimp_image_set_component_visible (gimage, component, visible);
}
return procedural_db_return_args (&image_set_component_visible_proc, success);
@ -3288,7 +3288,7 @@ image_get_filename_invoker (Argument *args)
return_args = procedural_db_return_args (&image_get_filename_proc, success);
if (success)
return_args[1].value.pdb_pointer = g_strdup (gimage_filename (gimage));
return_args[1].value.pdb_pointer = g_strdup (gimp_image_filename (gimage));
return return_args;
}
@ -3343,7 +3343,7 @@ image_set_filename_invoker (Argument *args)
success = FALSE;
if (success)
gimage_set_filename (gimage, filename);
gimp_image_set_filename (gimage, filename);
return procedural_db_return_args (&image_set_filename_proc, success);
}

6
app/image_map.c
View File

@ -25,8 +25,8 @@
#include "appenv.h"
#include "drawable.h"
#include "gdisplay.h"
#include "gimage.h"
#include "gimage_mask.h"
#include "gimpimage.h"
#include "image_map.h"
#include "paint_funcs.h"
#include "pixel_region.h"
@ -84,8 +84,8 @@ image_map_do (gpointer data)
/* apply the results */
pixel_region_init (&shadowPR, gimage->shadow, x, y, w, h, FALSE);
gimage_apply_image (gimage, _image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
gimp_image_apply_image (gimage, _image_map->drawable, &shadowPR,
FALSE, OPAQUE_OPACITY, REPLACE_MODE, NULL, x, y);
/* display the results */
if (_image_map->gdisp)

4
app/invert.c
View File

@ -25,7 +25,7 @@
#include "appenv.h"
#include "drawable.h"
#include "invert.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimplut.h"
#include "lut_funcs.h"
#include "pixel_processor.h"
@ -42,7 +42,7 @@ image_invert (GimpImage *gimage)
Argument *return_vals;
gint nreturn_vals;
drawable = gimage_active_drawable (gimage);
drawable = gimp_image_active_drawable (gimage);
if (gimp_drawable_is_indexed (drawable))
{

2
app/lc_dialog.c
View File

@ -576,7 +576,7 @@ lc_dialog_create_image_menu_callback (gpointer im,
*data->default_index = data->num_items;
}
image_name = g_basename (gimage_filename (gimage));
image_name = g_basename (gimp_image_filename (gimage));
menu_item_label =
g_strdup_printf ("%s-%d", image_name, pdb_image_to_id (gimage));
menu_item = gtk_menu_item_new();

8
app/menus/plug-in-menus.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

4
app/paint/gimpairbrush.c
View File

@ -27,7 +27,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gradient.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpbrush.h"
#include "gimpcontext.h"
#include "gimpui.h"
@ -340,7 +340,7 @@ airbrush_motion (PaintCore *paint_core,
}
else
{
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
col[area->bytes - 1] = OPAQUE_OPACITY;
color_pixels (temp_buf_data (area), col,
area->width * area->height, area->bytes);

7
app/paths_dialog.c
View File

@ -33,7 +33,6 @@
#include "draw_core.h"
#include "drawable.h"
#include "floating_sel.h"
#include "gimage.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimpdrawable.h"
@ -1329,10 +1328,10 @@ paths_dialog_advanced_to_path_callback (GtkWidget *widget,
args[1].arg_type = PDB_IMAGE;
args[1].value.pdb_int = (gint32) pdb_image_to_id (gimage);
args[2].arg_type = PDB_DRAWABLE;
args[2].value.pdb_int = (gint32) (gimage_active_drawable (gimage))->ID;
args[2].value.pdb_int = (gint32) (gimp_image_active_drawable (gimage))->ID;
plug_in_run (proc_rec, args, 3, FALSE, TRUE,
(gimage_active_drawable (gimage))->ID);
(gimp_image_active_drawable (gimage))->ID);
g_free (args);
@ -1370,7 +1369,7 @@ paths_dialog_sel_to_path_callback (GtkWidget *widget,
args[1].arg_type = PDB_IMAGE;
args[1].value.pdb_int = (gint32) pdb_image_to_id (gimage);
args[2].arg_type = PDB_DRAWABLE;
args[2].value.pdb_int = (gint32) (gimage_active_drawable (gimage))->ID;
args[2].value.pdb_int = (gint32) (gimp_image_active_drawable (gimage))->ID;
/* get the display by asking the current context */
gdisp = gimp_context_get_display (gimp_context_get_user ());

8
app/plug-in/gimpplugin-message.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimpplugin-progress.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimpplugin.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimppluginmanager-call.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimppluginmanager-run.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimppluginmanager.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/gimppluginshm.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-def.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-message.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-params.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-progress.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-run.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in-shm.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-in.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug-in/plug-ins.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

8
app/plug_in.c
View File

@ -87,7 +87,7 @@
#include "errors.h"
#include "gdisplay.h"
#include "general.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "gradient_select.h"
@ -1362,7 +1362,7 @@ plug_in_repeat (gboolean with_interface)
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ? RUN_INTERACTIVE : RUN_WITH_LAST_VALS);
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
/* run the plug-in procedure */
plug_in_run (last_plug_in, args, 3, FALSE, TRUE, gdisplay->ID);
@ -2624,7 +2624,7 @@ plug_in_callback (GtkWidget *widget,
/* initialize the first 3 plug-in arguments */
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else
@ -2647,7 +2647,7 @@ plug_in_callback (GtkWidget *widget,
gdisp_ID = gdisplay->ID;
args[1].value.pdb_int = pdb_image_to_id (gdisplay->gimage);
args[2].value.pdb_int = drawable_ID (gimage_active_drawable (gdisplay->gimage));
args[2].value.pdb_int = drawable_ID (gimp_image_active_drawable (gdisplay->gimage));
argc = 3;
}
else

4
app/tools/airbrush.c
View File

@ -27,7 +27,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gradient.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpbrush.h"
#include "gimpcontext.h"
#include "gimpui.h"
@ -340,7 +340,7 @@ airbrush_motion (PaintCore *paint_core,
}
else
{
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
col[area->bytes - 1] = OPAQUE_OPACITY;
color_pixels (temp_buf_data (area), col,
area->width * area->height, area->bytes);

4
app/tools/gimpairbrushtool.c
View File

@ -27,7 +27,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gradient.h"
#include "gimage.h"
#include "gimpimage.h"
#include "gimpbrush.h"
#include "gimpcontext.h"
#include "gimpui.h"
@ -340,7 +340,7 @@ airbrush_motion (PaintCore *paint_core,
}
else
{
gimage_get_foreground (gimage, drawable, col);
gimp_image_get_foreground (gimage, drawable, col);
col[area->bytes - 1] = OPAQUE_OPACITY;
color_pixels (temp_buf_data (area), col,
area->width * area->height, area->bytes);

2
app/xcf.c
View File

@ -409,7 +409,7 @@ xcf_save_invoker (Argument *args)
success = FALSE;
gimage = gimage_get_ID (args[1].value.pdb_int);
gimage = pdb_id_to_image (args[1].value.pdb_int);
filename = args[3].value.pdb_pointer;
info.fp = fopen (filename, "wb");

2
app/xcf/xcf.c
View File

@ -409,7 +409,7 @@ xcf_save_invoker (Argument *args)
success = FALSE;
gimage = gimage_get_ID (args[1].value.pdb_int);
gimage = pdb_id_to_image (args[1].value.pdb_int);
filename = args[3].value.pdb_pointer;
info.fp = fopen (filename, "wb");

4
tools/pdbgen/pdb/color.pdb
View File

@ -588,7 +588,7 @@ HELP
}
%invoke = (
headers => [ qw("histogram_tool.h" "gimage.h") ],
headers => [ qw("histogram_tool.h" "gimpimage.h") ],
vars => [ 'PixelRegion srcPR, maskPR', 'int x1, y1, x2, y2',
'HistogramToolDialog htd', 'int off_x, off_y',
'gboolean no_mask', 'Channel *mask' ],
@ -619,7 +619,7 @@ HELP
x1, y1, (x2 - x1), (y2 - y1), FALSE);
/* Configure the mask from the gimage's selection mask */
mask = gimage_get_mask (drawable_gimage (GIMP_DRAWABLE (drawable)));
mask = gimp_image_get_mask (drawable_gimage (GIMP_DRAWABLE (drawable)));
pixel_region_init (&maskPR, gimp_drawable_data (GIMP_DRAWABLE(mask)),
x1 + off_x, y1 + off_y, (x2 - x1), (y2 - y1), FALSE);

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

@ -27,7 +27,7 @@ sub simple_invoke {
my $type = shift;
%invoke = (
code => <<CODE
if ((success = (gimage_base_type (gimage) != $type)))
if ((success = (gimp_image_base_type (gimage) != $type)))
convert_image ((void *) gimage, $type, 0, 0, 0, 1, 0);
CODE
);
@ -100,7 +100,7 @@ HELP
headers => [ qw(<string.h> "palette.h") ],
code => <<'CODE'
{
if ((success = (gimage_base_type (gimage) != INDEXED)))
if ((success = (gimp_image_base_type (gimage) != INDEXED)))
{
PaletteEntries *entries;
PaletteEntries *the_palette = NULL;
@ -164,7 +164,7 @@ CODE
);
}
@headers = qw("gimage.h" "palette_entries.h" "convert.h");
@headers = qw("gimpimage.h" "palette_entries.h" "convert.h");
@procs = qw(convert_rgb convert_grayscale convert_indexed);
%exports = (app => [@procs], lib => [@procs]);

62
tools/pdbgen/pdb/image.pdb
View File

@ -107,7 +107,7 @@ HELP
}
%invoke = (
code => "success = gimage_${op}_$type$extra (gimage, $type) != NULL;"
code => "success = gimp_image_${op}_$type$extra (gimage, $type) != NULL;"
);
}
@ -131,7 +131,7 @@ sub image_get_prop_proc {
desc => "The $desc", no_declare => 1 }
);
my $alias = $func ? "gimage_get_$prop (gimage)" : "gimage->$prop";
my $alias = $func ? "gimp_image_get_$prop (gimage)" : "gimage->$prop";
$alias = "g_strdup ($alias)" if $type eq 'string';
$outargs[0]->{alias} .= "$alias";
@ -172,7 +172,7 @@ sub image_set_prop_proc {
$inargs[1]->{desc} .= ' (%%desc%%)';
}
$invoke{code} = $func ? "gimage_set_$prop (gimage, $prop);"
$invoke{code} = $func ? "gimp_image_set_$prop (gimage, $prop);"
: "gimage->$prop = $prop;";
if ($type eq 'color') {
@ -298,7 +298,7 @@ HELP
code => <<'CODE'
{
gimp_add_busy_cursors_until_idle ();
gimage_resize (gimage, new_width, new_height, offx, offy);
gimp_image_resize (gimage, new_width, new_height, offx, offy);
}
CODE
);
@ -326,7 +326,7 @@ HELP
code => <<'CODE'
{
gimp_add_busy_cursors_until_idle ();
gimage_scale (gimage, new_width, new_height);
gimp_image_scale (gimage, new_width, new_height);
}
CODE
);
@ -363,7 +363,7 @@ HELP
@inargs = ( &std_image_arg );
%invoke = ( code => 'gimage_free_shadow (gimage);' );
%invoke = ( code => 'gimp_image_free_shadow (gimage);' );
}
sub image_get_layers {
@ -394,7 +394,7 @@ HELP
@inargs = ( &std_image_arg );
%invoke = ( code => 'gimage_unset_active_channel (gimage);' );
%invoke = ( code => 'gimp_image_unset_active_channel (gimage);' );
}
sub image_pick_correlate_layer {
@ -421,7 +421,7 @@ HELP
);
%invoke = (
code => 'layer = gimage_pick_correlate_layer (gimage, x, y);'
code => 'layer = gimp_image_pick_correlate_layer (gimage, x, y);'
);
}
@ -477,7 +477,7 @@ HELP
%invoke = (
code => <<'CODE'
{
layer = gimage_merge_visible_layers (gimage, merge_type);
layer = gimp_image_merge_visible_layers (gimage, merge_type);
success = layer != NULL;
}
CODE
@ -543,7 +543,7 @@ HELP
);
%invoke = (
code => 'success = (layer = gimage_flatten (gimage)) != NULL;'
code => 'success = (layer = gimp_image_flatten (gimage)) != NULL;'
);
}
@ -571,7 +571,7 @@ HELP
my $base = $_ eq 'color' ? 'RGB' : uc($_);
$invoke{code} .= ' ' x 6 if $once++;
$invoke{code} .= <<CODE
(drawable_$_ (GIMP_DRAWABLE (layer)) && gimage_base_type (gimage) != $base) ||
(drawable_$_ (GIMP_DRAWABLE (layer)) && gimp_image_base_type (gimage) != $base) ||
CODE
}
$invoke{code} =~ s/ \|\|\n$/)\n/s;
@ -579,7 +579,7 @@ CODE
$invoke{code} .= <<'CODE';
success = FALSE;
else
success = gimage_add_layer (gimage, layer, MAX (position, -1)) != NULL;
success = gimp_image_add_layer (gimage, layer, MAX (position, -1)) != NULL;
}
CODE
}
@ -601,7 +601,7 @@ HELP
&layer_arg
);
%invoke = ( code => 'gimage_remove_layer (gimage, layer);' );
%invoke = ( code => 'gimp_image_remove_layer (gimage, layer);' );
}
sub image_add_layer_mask {
@ -627,7 +627,7 @@ HELP
%invoke = (
code => <<'CODE'
success = gimage_add_layer_mask (gimage, layer, mask) != NULL;
success = gimp_image_add_layer_mask (gimage, layer, mask) != NULL;
CODE
);
}
@ -650,7 +650,7 @@ HELP
);
$inargs[1]->{desc} .= ' from which to remove mask';
%invoke = ( code => 'gimage_remove_layer_mask (gimage, layer, mode);' );
%invoke = ( code => 'gimp_image_remove_layer_mask (gimage, layer, mode);' );
}
sub image_raise_channel {
@ -683,7 +683,7 @@ HELP
%invoke = (
code => <<'CODE'
success = gimage_add_channel (gimage, channel, MAX (position, -1)) != NULL;
success = gimp_image_add_channel (gimage, channel, MAX (position, -1)) != NULL;
CODE
);
}
@ -703,7 +703,7 @@ HELP
&channel_arg
);
%invoke = ( code => 'gimage_remove_channel (gimage, channel);' );
%invoke = ( code => 'gimp_image_remove_channel (gimage, channel);' );
}
sub image_active_drawable {
@ -728,7 +728,7 @@ HELP
%invoke = (
code => <<'CODE'
success = (drawable = gimage_active_drawable (gimage)) != NULL;
success = (drawable = gimp_image_active_drawable (gimage)) != NULL;
CODE
);
}
@ -750,7 +750,7 @@ HELP
desc => "The image's base type: { %%desc%% }" }
);
%invoke = ( code => 'base_type = gimage_base_type (gimage);' );
%invoke = ( code => 'base_type = gimp_image_base_type (gimage);' );
}
sub image_get_cmap {
@ -780,7 +780,7 @@ HELP
{
num_bytes = gimage->num_cols * 3;
cmap = g_new (guint8, num_bytes);
memcpy (cmap, gimage_cmap (gimage), num_bytes);
memcpy (cmap, gimp_image_cmap (gimage), num_bytes);
}
CODE
);
@ -872,7 +872,7 @@ HELP
alias => 'success ? TRUE : FALSE', no_declare => 1 }
);
%invoke = ( code => 'success = gimage_enable_undo (gimage);' );
%invoke = ( code => 'success = gimp_image_undo_enable (gimage);' );
}
sub image_undo_disable {
@ -895,7 +895,7 @@ HELP
alias => 'success ? TRUE : FALSE', no_declare => 1 }
);
%invoke = ( code => 'success = gimage_disable_undo (gimage);' );
%invoke = ( code => 'success = gimp_image_undo_disable (gimage);' );
}
sub image_undo_thaw {
@ -924,7 +924,7 @@ HELP
alias => 'success ? TRUE : FALSE', no_declare => 1 }
);
%invoke = ( code => 'success = gimage_thaw_undo (gimage);' );
%invoke = ( code => 'success = gimp_image_undo_thaw (gimage);' );
}
sub image_undo_freeze {
@ -953,7 +953,7 @@ HELP
alias => 'success ? TRUE : FALSE', no_declare => 1 }
);
%invoke = ( code => 'success = gimage_freeze_undo (gimage);' );
%invoke = ( code => 'success = gimp_image_undo_freeze (gimage);' );
}
sub image_clean_all {
@ -970,7 +970,7 @@ HELP
@inargs = ( &std_image_arg );
%invoke = ( code => 'gimage_clean_all (gimage);' );
%invoke = ( code => 'gimp_image_clean_all (gimage);' );
}
sub image_floating_selection {
@ -991,7 +991,7 @@ HELP
return_fail => -1 }
);
%invoke = ( code => 'floating_sel = gimage_floating_sel (gimage);' );
%invoke = ( code => 'floating_sel = gimp_image_floating_sel (gimage);' );
}
sub image_floating_sel_attached_to {
@ -1017,7 +1017,7 @@ HELP
vars => [ 'Layer *floating_sel' ],
code => <<'CODE'
{
floating_sel = gimage_floating_sel (gimage);
floating_sel = gimp_image_floating_sel (gimage);
if (floating_sel)
drawable = GIMP_DRAWABLE (GIMP_LAYER (floating_sel)->fs.drawable);
@ -1094,7 +1094,7 @@ CODE2
&image_accessors('selection', 'selection', 'selection', 1,
[ <<'CODE', undef ]);
$invoke{code} = "success = (selection = gimage_get_mask (gimage)) != NULL;";
$invoke{code} = "success = (selection = gimp_image_get_mask (gimage)) != NULL;";
delete @{$outargs[0]}{qw(alias no_declare)};
$outargs[0]->{desc} .= ' channel';
$outargs[0]->{init} = 1;
@ -1114,11 +1114,11 @@ my $comp_arg = <<'CODE';
$invoke{code} = <<'SUCCESS';
{
if (component == GRAY_CHANNEL)
success = gimage_base_type (gimage) == GRAY;
success = gimp_image_base_type (gimage) == GRAY;
else if (component == INDEXED_CHANNEL)
success = gimage_base_type (gimage) == INDEXED;
success = gimp_image_base_type (gimage) == INDEXED;
else
success = gimage_base_type (gimage) == RGB;
success = gimp_image_base_type (gimage) == RGB;
}
SUCCESS
CODE