dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plug-ins: port from gimp_image_add_foo() to gimp_image_insert_foo()

Browse source 
I'm sure some plug-ins need to add their items *not* at the toplevel,
but since making plug-ins really tree-aware is a lot more work than
just fixing insert positions, I went for passing -1 as parent in
almost all cases. And because of laziness...
This commit is contained in:
Michael Natterer 2010-09-06 11:40:46 +02:00
parent 8f66651123
commit bbd7ec6b5c
56 changed files with 83 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libgimp/gimpexport.c
View file

@ -96,7 +96,7 @@ export_merge (gint32 image_ID,
gimp_image_height (image_ID),
gimp_drawable_type (*drawable_ID) | 1,
100.0, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, transp, 1);
gimp_image_insert_layer (image_ID, transp, -1, 1);
gimp_selection_none (image_ID);
gimp_edit_clear (transp);
nvisible++;

4
plug-ins/common/animation-optimize.c
View file

@ -644,7 +644,7 @@ do_optimizations (GimpRunMode run_mode,
100.0,
GIMP_NORMAL_MODE);
gimp_image_add_layer (new_image_id, new_layer_id, 0);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);
drawable = gimp_drawable_get (new_layer_id);
@ -1068,7 +1068,7 @@ do_optimizations (GimpRunMode run_mode,
GIMP_NORMAL_MODE);
g_free (newlayer_name);
gimp_image_add_layer (new_image_id, new_layer_id, 0);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);
drawable = gimp_drawable_get (new_layer_id);

2
plug-ins/common/compose.c
View file

@ -933,7 +933,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*drawable = gimp_drawable_get (*layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

6
plug-ins/common/curve-bend.c
View file

@ -2692,7 +2692,7 @@ p_create_pv_image (GimpDrawable *src_drawable,
gimp_layer_add_alpha(*layer_id);
}
gimp_image_add_layer(l_new_image_id, *layer_id, 0);
gimp_image_insert_layer(l_new_image_id, *layer_id, -1, 0);
dst_drawable = gimp_drawable_get (*layer_id);
p_init_gdrw(&l_src_gdrw, src_drawable, FALSE, FALSE);
@ -2769,7 +2769,7 @@ p_add_layer (gint width,
}
/* add the copied layer to the temp. working image */
gimp_image_add_layer (image_id, l_new_layer_id, stack_position);
gimp_image_insert_layer (image_id, l_new_layer_id, -1, stack_position);
/* copy visiblity state */
gimp_item_set_visible (l_new_layer_id, l_visible);
@ -3209,7 +3209,7 @@ p_main_bend (BenderDialog *cd,
* (for the case of undo GIMP must know,
* that the layer was part of the image)
*/
gimp_image_add_layer (l_image_id, l_tmp_layer_id, 0);
gimp_image_insert_layer (l_image_id, l_tmp_layer_id, -1, 0);
gimp_item_set_visible (l_tmp_layer_id, FALSE);
gimp_item_set_name (l_tmp_layer_id, "curve_bend_dummylayer");

2
plug-ins/common/decompose.c
View file

@ -726,7 +726,7 @@ create_new_layer (gint32 image_ID,
layer_ID = gimp_layer_new (image_ID, layername, width, height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, position);
gimp_image_insert_layer (image_ID, layer_ID, -1, position);
*drawable = gimp_drawable_get (layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

8
plug-ins/common/edge-dog.c
View file

@ -468,12 +468,14 @@ dog (gint32 image_ID,
layer1 = gimp_layer_copy (drawable_id);
gimp_item_set_visible (layer1, FALSE);
gimp_item_set_name (layer1, "dog_scratch_layer1");
gimp_image_add_layer (image_ID, layer1, 0);
gimp_image_insert_layer (image_ID, layer1,
gimp_item_get_parent (drawable_id), 0);
layer2 = gimp_layer_copy (drawable_id);
gimp_item_set_visible (layer2, FALSE);
gimp_item_set_name (layer2, "dog_scratch_layer2");
gimp_image_add_layer (image_ID, layer2, 0);
gimp_image_insert_layer (image_ID, layer2,
gimp_item_get_parent (drawable_id), 0);
drawable1 = gimp_drawable_get (layer1);
drawable2 = gimp_drawable_get (layer2);
@ -985,7 +987,7 @@ preview_update_preview (GimpPreview *preview,
100,
GIMP_NORMAL_MODE);
preview_drawable = gimp_drawable_get (preview_id);
gimp_image_add_layer (image_id, preview_id, 0);
gimp_image_insert_layer (image_id, preview_id, -1, 0);
gimp_layer_set_offsets (preview_id, 0, 0);
gimp_pixel_rgn_init (&preview_rgn, preview_drawable,
0, 0, width, height, TRUE, TRUE);

2
plug-ins/common/file-cel.c
View file

@ -363,7 +363,7 @@ load_image (const gchar *file,
else
layer = gimp_layer_new (image, _("Background"), width, height,
GIMP_INDEXEDA_IMAGE, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
gimp_layer_set_offsets (layer, offx, offy);
/* Get the drawable and set the pixel region for our load... */

2
plug-ins/common/file-dicom.c
View file

@ -611,7 +611,7 @@ load_image (const gchar *filename,
(dicominfo->samples_per_pixel >= 3 ?
GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);
gimp_pixel_rgn_init (&pixel_rgn, drawable,

2
plug-ins/common/file-gbr.c
View file

@ -592,7 +592,7 @@ load_image (const gchar *filename,
layer_ID = gimp_layer_new (image_ID, name, bh.width, bh.height,
image_type, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
g_free (name);

2
plug-ins/common/file-gif-load.c
View file

@ -1033,7 +1033,7 @@ ReadImage (FILE *fd,
frame_number++;
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
gimp_layer_translate (layer_ID, (gint) leftpos, (gint) toppos);
drawable = gimp_drawable_get (layer_ID);

2
plug-ins/common/file-gih.c
View file

@ -597,7 +597,7 @@ gih_load_one_brush (gint fd,
if (layer_ID != -1)
{
gimp_image_add_layer (image_ID, layer_ID, num_layers++);
gimp_image_insert_layer (image_ID, layer_ID, -1, num_layers++);
gimp_layer_set_offsets (layer_ID,
(new_width - bh.width) / 2,
(new_height - bh.height) / 2);

2
plug-ins/common/file-jp2-load.c
View file

@ -351,7 +351,7 @@ load_image (const gchar *filename,
_("Background"),
width, height,
image_type, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);
gimp_tile_cache_ntiles (drawable->ntile_cols);

2
plug-ins/common/file-pat.c
View file

@ -432,7 +432,7 @@ load_image (const gchar *filename,
layer_ID = gimp_layer_new (image_ID, name, ph.width, ph.height,
image_type, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
g_free (name);

2
plug-ins/common/file-pcx.c
View file

@ -425,7 +425,7 @@ load_image (const gchar *filename,
GIMP_INDEXED_IMAGE, 100, GIMP_NORMAL_MODE);
}
gimp_image_set_filename (image, filename);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
gimp_layer_set_offsets (layer, offset_x, offset_y);
drawable = gimp_drawable_get (layer);

2
plug-ins/common/file-pdf-load.c
View file

@ -576,7 +576,7 @@ layer_from_pixbuf (gint32 image,
progress_start,
progress_start + progress_scale);
gimp_image_add_layer (image, layer, position);
gimp_image_insert_layer (image, layer, -1, position);
return layer;
}

2
plug-ins/common/file-pix.c
View file

@ -382,7 +382,7 @@ load_image (const gchar *filename,
width,
height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, drawable->width,
drawable->height, TRUE, FALSE);

2
plug-ins/common/file-png.c
View file

@ -850,7 +850,7 @@ load_image (const gchar *filename,
layer = gimp_layer_new (image, _("Background"), info->width, info->height,
layer_type, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
/*
* Find out everything we can about the image resolution

2
plug-ins/common/file-pnm.c
View file

@ -586,7 +586,7 @@ load_image (const gchar *filename,
(pnminfo->np >= 3 ?
GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);
gimp_pixel_rgn_init (&pixel_rgn, drawable,

4
plug-ins/common/file-ps.c
View file

@ -1137,7 +1137,7 @@ load_image (const gchar *filename,
current_layer = gimp_layer_new_from_drawable (tmp_ID, image_ID);
gimp_item_set_name (current_layer, name);
gimp_image_add_layer (image_ID, current_layer, -1);
gimp_image_insert_layer (image_ID, current_layer, -1, -1);
gimp_image_delete (image_list[k]);
g_free (name);
@ -1934,7 +1934,7 @@ create_new_image (const gchar *filename,
gdtype, 100, GIMP_NORMAL_MODE);
g_free (tmp);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*drawable = gimp_drawable_get (*layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

2
plug-ins/common/file-psp.c
View file

@ -1451,7 +1451,7 @@ read_layer_block (FILE *f,
g_free (name);
gimp_image_add_layer (image_ID, layer_ID, -1);
gimp_image_insert_layer (image_ID, layer_ID, -1, -1);
if (saved_image_rect[0] != 0 || saved_image_rect[1] != 0)
gimp_layer_set_offsets (layer_ID,

2
plug-ins/common/file-raw.c
View file

@ -761,7 +761,7 @@ load_image (const gchar *filename,
layer_id = gimp_layer_new (data->image_id, _("Background"),
runtime->image_width, runtime->image_height, ltype,
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (data->image_id, layer_id, 0);
gimp_image_insert_layer (data->image_id, layer_id, -1, 0);
data->drawable = gimp_drawable_get (layer_id);

2
plug-ins/common/file-sunras.c
View file

@ -973,7 +973,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*drawable = gimp_drawable_get (*layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

2
plug-ins/common/file-svg.c
View file

@ -351,7 +351,7 @@ load_image (const gchar *filename,
layer = gimp_layer_new_from_pixbuf (image, _("Rendered SVG"), pixbuf,
100, GIMP_NORMAL_MODE, 0.0, 1.0);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
gimp_image_undo_enable (image);

2
plug-ins/common/file-tga.c
View file

@ -1065,7 +1065,7 @@ ReadImage (FILE *fp,
dtype, 100,
GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);

6
plug-ins/common/file-tiff-load.c
View file

@ -1016,7 +1016,7 @@ load_image (const gchar *filename,
channel[i].ID = gimp_channel_new (image, _("TIFF Channel"),
cols, rows,
100.0, &color);
gimp_image_add_channel (image, channel[i].ID, 0);
gimp_image_insert_channel (image, channel[i].ID, -1, 0);
channel[i].drawable = gimp_drawable_get (channel[i].ID);
}
}
@ -1118,7 +1118,7 @@ load_image (const gchar *filename,
if (ilayer > 0 && !alpha)
gimp_layer_add_alpha (layer);
gimp_image_add_layer (image, layer, -1);
gimp_image_insert_layer (image, layer, -1, -1);
if (target == GIMP_PAGE_SELECTOR_TARGET_IMAGES)
{
@ -1289,7 +1289,7 @@ load_paths (TIFF *tif, gint image)
gboolean closed = FALSE;
vectors = gimp_vectors_new (image, name);
gimp_image_add_vectors (image, vectors, path_index);
gimp_image_insert_vectors (image, vectors, -1, path_index);
path_index++;
while (rec < pos + len)

2
plug-ins/common/file-wmf.c
View file

@ -1037,7 +1037,7 @@ load_image (const gchar *filename,
/* Tell GIMP to display the image.
*/
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
gimp_drawable_flush (drawable);
return image;

2
plug-ins/common/file-xbm.c
View file

@ -898,7 +898,7 @@ load_image (const gchar *filename,
GIMP_INDEXED_IMAGE,
100,
GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);

4
plug-ins/common/file-xmc.c
View file

@ -739,7 +739,7 @@ load_image (const gchar *filename, GError **error)
imagesp->images[i]->width,
imagesp->images[i]->height,
GIMP_RGBA_IMAGE, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
/* Adjust layer position to let hotspot sit on the same point. */
gimp_layer_translate (layer_ID,
@ -964,7 +964,7 @@ load_thumbnail (const gchar *filename, gint32 thumb_size,
GIMP_RGBA_IMAGE, 100,
GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
/*
* Get the drawable and set the pixel region for our load...

2
plug-ins/common/file-xpm.c
View file

@ -482,7 +482,7 @@ parse_image (gint32 image_ID,
100,
GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);

2
plug-ins/common/file-xwd.c
View file

@ -1196,7 +1196,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, "Background", width, height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*drawable = gimp_drawable_get (*layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

4
plug-ins/common/film.c
View file

@ -486,7 +486,7 @@ film (void)
gimp_layer_resize_to_image_size (layer_ID_src);
new_layer = gimp_layer_new_from_drawable (layer_ID_src,
image_ID_dst);
gimp_image_add_layer (image_ID_dst, new_layer, -1);
gimp_image_insert_layer (image_ID_dst, new_layer, -1, -1);
gimp_layer_set_offsets (new_layer, picture_x0, picture_y0);
/* Draw picture numbers */
@ -744,7 +744,7 @@ create_new_image (const gchar *filename,
gimp_image_undo_disable (image_ID);
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
if (drawable)
{

2
plug-ins/common/hot.c
View file

@ -351,7 +351,7 @@ pluginCore (piArgs *argp)
GIMP_RGBA_IMAGE, (gdouble)100, GIMP_NORMAL_MODE);
ndrw = gimp_drawable_get (nl);
gimp_drawable_fill (nl, GIMP_TRANSPARENT_FILL);
gimp_image_add_layer (argp->image, nl, 0);
gimp_image_insert_layer (argp->image, nl, -1, 0);
}
gimp_drawable_mask_bounds (drw->drawable_id,

4
plug-ins/common/iwarp.c
View file

@ -796,7 +796,7 @@ iwarp (void)
gimp_item_set_name (animlayers[i], st);
g_free (st);
gimp_image_add_layer (imageID, animlayers[i], 0);
gimp_image_insert_layer (imageID, animlayers[i], -1, 0);
destdrawable = gimp_drawable_get (animlayers[i]);
@ -828,7 +828,7 @@ iwarp (void)
gimp_item_set_name (layerID, st);
g_free (st);
gimp_image_add_layer (imageID, layerID, 0);
gimp_image_insert_layer (imageID, layerID, -1, 0);
}
}
g_free (animlayers);

4
plug-ins/common/screenshot.c
View file

@ -803,7 +803,7 @@ create_image (GdkPixbuf *pixbuf,
name ? name : _("Screenshot"),
pixbuf,
100, GIMP_NORMAL_MODE, 0.0, 1.0);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
if (shape && ! gdk_region_empty (shape))
{
@ -887,7 +887,7 @@ add_cursor_image (gint32 image,
gimp_drawable_detach (drawable);
gimp_image_add_layer (image, layer, -1);
gimp_image_insert_layer (image, layer, -1, -1);
gimp_layer_set_offsets (layer,
cursor->x - cursor->xhot, cursor->y - cursor->yhot);

2
plug-ins/common/smooth-palette.c
View file

@ -257,7 +257,7 @@ smooth_palette (GimpDrawable *drawable,
config.width, config.height,
gimp_drawable_type (drawable->drawable_id),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (new_image_id, *layer_id, 0);
gimp_image_insert_layer (new_image_id, *layer_id, -1, 0);
new_layer = gimp_drawable_get (*layer_id);
psize = config.width;

2
plug-ins/common/tile.c
View file

@ -271,7 +271,7 @@ tile (gint32 image_id,
if (*layer_id == -1)
return -1;
gimp_image_add_layer (new_image_id, *layer_id, 0);
gimp_image_insert_layer (new_image_id, *layer_id, -1, 0);
new_layer = gimp_drawable_get (*layer_id);
/* Get the source drawable */

4
plug-ins/common/warp.c
View file

@ -949,8 +949,8 @@ diff (GimpDrawable *drawable,
draw_yd = gimp_drawable_get (ylayer_id);
draw_xd = gimp_drawable_get (xlayer_id);
gimp_image_add_layer (new_image_id, xlayer_id, 1);
gimp_image_add_layer (new_image_id, ylayer_id, 1);
gimp_image_insert_layer (new_image_id, xlayer_id, -1, 1);
gimp_image_insert_layer (new_image_id, ylayer_id, -1, 1);
gimp_drawable_fill (xlayer_id, GIMP_BACKGROUND_FILL);
gimp_drawable_fill (ylayer_id, GIMP_BACKGROUND_FILL);
gimp_image_set_active_layer (image_id, layer_active);

4
plug-ins/file-bmp/bmp-read.c
View file

@ -385,7 +385,7 @@ ReadBMP (const gchar *name,
g_object_unref (pixbuf);
gimp_image_set_filename (image_ID, filename);
gimp_image_add_layer (image_ID, layer_ID, -1);
gimp_image_insert_layer (image_ID, layer_ID, -1, -1);
return image_ID;
}
@ -651,7 +651,7 @@ ReadImage (FILE *fd,
gimp_image_set_filename (image, filename);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
drawable = gimp_drawable_get (layer);
/* use g_malloc0 to initialize the dest buffer so that unspecified

2
plug-ins/file-faxg3/faxg3.c
View file

@ -478,7 +478,7 @@ emitgimp (gint hcol,
hcol,
row,
GIMP_GRAY_IMAGE, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
drawable = gimp_drawable_get (layer_ID);
gimp_pixel_rgn_init (&pixel_rgn, drawable,

2
plug-ins/file-fits/fits.c
View file

@ -528,7 +528,7 @@ create_new_image (const gchar *filename,
gimp_image_undo_disable (image_ID);
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
dtype, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_ID, *layer_ID, 0);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*drawable = gimp_drawable_get (*layer_ID);
gimp_pixel_rgn_init (pixel_rgn, *drawable, 0, 0, (*drawable)->width,

2
plug-ins/file-fli/fli-gimp.c
View file

@ -581,7 +581,7 @@ load_image (const gchar *filename,
if (cnt > 0)
gimp_layer_add_alpha (layer_ID);
gimp_image_add_layer (image_id, layer_ID, 0);
gimp_image_insert_layer (image_id, layer_ID, -1, 0);
if (cnt < to_frame)
{

4
plug-ins/file-ico/ico-dialog.c
View file

@ -259,7 +259,7 @@ ico_dialog_update_icon_preview (GtkWidget *dialog,
tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h,
gimp_drawable_type (layer),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (tmp_image, tmp_layer, 0);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
drawable = gimp_drawable_get (layer);
tmp = gimp_drawable_get (tmp_layer);
@ -355,7 +355,7 @@ ico_dialog_update_icon_preview (GtkWidget *dialog,
tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h,
gimp_drawable_type (layer),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (tmp_image, tmp_layer, 0);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
drawable = gimp_drawable_get (layer);
tmp = gimp_drawable_get (tmp_layer);

2
plug-ins/file-ico/ico-load.c
View file

@ -615,7 +615,7 @@ ico_load_layer (FILE *fp,
g_snprintf (buf, sizeof (buf), _("Icon #%i"), icon_num+1);
layer = gimp_layer_new (image, buf, width, height,
GIMP_RGBA_IMAGE, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image, layer, icon_num);
gimp_image_insert_layer (image, layer, -1, icon_num);
drawable = gimp_drawable_get (layer);
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
drawable->width, drawable->height, TRUE, FALSE);

2
plug-ins/file-ico/ico-save.c
View file

@ -577,7 +577,7 @@ ico_image_get_reduced_buf (guint32 layer,
tmp_layer = gimp_layer_new (tmp_image, "tmp", w, h,
gimp_drawable_type (layer),
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (tmp_image, tmp_layer, 0);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
tmp = gimp_drawable_get (tmp_layer);

4
plug-ins/file-jpeg/jpeg-load.c
View file

@ -467,7 +467,7 @@ load_image (const gchar *filename,
gimp_drawable_detach (drawable);
}
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
#ifdef HAVE_EXIF
jpeg_exif_rotate_query (image_ID, orientation);
@ -814,7 +814,7 @@ load_thumbnail_image (const gchar *filename,
* corrupt-data warnings occurred (test whether
* jerr.num_warnings is nonzero).
*/
gimp_image_add_layer (image_ID, layer_ID, 0);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
/* NOW to get the dimensions of the actual image to return the

4
plug-ins/file-psd/psd-image-res-load.c
View file

@ -1045,7 +1045,7 @@ load_resource_1033 (const PSDimageres *res_a,
* corrupt-data warnings occurred (test whether
* jerr.num_warnings is nonzero).
*/
gimp_image_add_layer (image_id, layer_id, 0);
gimp_image_insert_layer (image_id, layer_id, -1, 0);
gimp_drawable_detach (drawable);
return 0;
@ -1408,7 +1408,7 @@ load_resource_2000 (const PSDimageres *res_a,
/* Create path */
vector_id = gimp_vectors_new (image_id, res_a->name);
gimp_image_add_vectors (image_id, vector_id, -1);
gimp_image_insert_vectors (image_id, vector_id, -1, -1);
while (path_rec > 0)
{

8
plug-ins/file-psd/psd-load.c
View file

@ -1251,7 +1251,7 @@ add_layers (const gint32 image_id,
img_a->columns, img_a->rows,
image_type, 0, GIMP_NORMAL_MODE);
g_free (lyr_a[lidx]->name);
gimp_image_add_layer (image_id, layer_id, -1);
gimp_image_insert_layer (image_id, layer_id, -1, -1);
drawable = gimp_drawable_get (layer_id);
gimp_drawable_fill (drawable->drawable_id, GIMP_TRANSPARENT_FILL);
gimp_item_set_visible (drawable->drawable_id, lyr_a[lidx]->layer_flags.visible);
@ -1288,7 +1288,7 @@ add_layers (const gint32 image_id,
layer_mode);
IFDBG(3) g_debug ("Layer tattoo: %d", layer_id);
g_free (lyr_a[lidx]->name);
gimp_image_add_layer (image_id, layer_id, -1);
gimp_image_insert_layer (image_id, layer_id, -1, -1);
gimp_layer_set_offsets (layer_id, l_x, l_y);
gimp_layer_set_lock_alpha (layer_id, lyr_a[lidx]->layer_flags.trans_prot);
drawable = gimp_drawable_get (layer_id);
@ -1575,7 +1575,7 @@ add_merged_image (const gint32 image_id,
img_a->columns, img_a->rows,
image_type,
100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image_id, layer_id, 0);
gimp_image_insert_layer (image_id, layer_id, -1, 0);
drawable = gimp_drawable_get (layer_id);
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
drawable->width, drawable->height, TRUE, FALSE);
@ -1665,7 +1665,7 @@ add_merged_image (const gint32 image_id,
channel_id = gimp_channel_new (image_id, alpha_name,
chn_a[cidx].columns, chn_a[cidx].rows,
alpha_opacity, &alpha_rgb);
gimp_image_add_channel (image_id, channel_id, 0);
gimp_image_insert_channel (image_id, channel_id, -1, 0);
g_free (alpha_name);
drawable = gimp_drawable_get (channel_id);
if (alpha_id)

2
plug-ins/file-sgi/sgi.c
View file

@ -403,7 +403,7 @@ load_image (const gchar *filename,
layer = gimp_layer_new (image, _("Background"), sgip->xsize, sgip->ysize,
layer_type, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer (image, layer, 0);
gimp_image_insert_layer (image, layer, -1, 0);
/*
* Get the drawable and set the pixel region for our load...

6
plug-ins/file-xjt/xjt.c
View file

@ -3455,7 +3455,7 @@ load_xjt_image (const gchar *filename,
else
{
/* add the layer on top of the images layerstak */
gimp_image_add_layer (l_image_id, l_layer_id, 0);
gimp_image_insert_layer (l_image_id, l_layer_id, -1, 0);
if(l_layer_prp_ptr->floating_attached)
{
@ -3610,7 +3610,7 @@ load_xjt_image (const gchar *filename,
else
{
/* add channel on top of the channelstack */
gimp_image_add_channel (l_image_id, l_channel_id, 0);
gimp_image_insert_channel (l_image_id, l_channel_id, -1, 0);
/* adjust offsets and other channelproperties */
gimp_drawable_set_visible (l_channel_id, l_channel_prp_ptr->visible);
@ -3639,7 +3639,7 @@ load_xjt_image (const gchar *filename,
* (if patches are not installed you'll get the error for sure)
*/
printf("XJT: floating_selection is added as top-layer (attach failed)\n");
gimp_image_add_layer (l_image_id, l_fsel_id, 0);
gimp_image_insert_layer (l_image_id, l_fsel_id, -1, 0);
}
}

2
plug-ins/gfig/gfig-dialog.c
View file

@ -247,7 +247,7 @@ gfig_dialog (void)
img_width, img_height,
GIMP_RGBA_IMAGE, 100.0, GIMP_NORMAL_MODE);
gimp_drawable_fill (newlayer, GIMP_TRANSPARENT_FILL);
gimp_image_add_layer (gfig_context->image_id, newlayer, -1);
gimp_image_insert_layer (gfig_context->image_id, newlayer, -1, -1);
gfig_context->drawable_id = newlayer;
gfig_context->using_new_layer = TRUE;
}

2
plug-ins/lighting/lighting-apply.c
View file

@ -69,7 +69,7 @@ compute_image (void)
GIMP_NORMAL_MODE);
}
gimp_image_add_layer (new_image_id, new_layer_id, 0);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);
output_drawable = gimp_drawable_get (new_layer_id);
}

2
plug-ins/map-object/map-object-apply.c
View file

@ -263,7 +263,7 @@ compute_image (void)
GIMP_NORMAL_MODE);
}
gimp_image_add_layer (new_image_id, new_layer_id, 0);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);
output_drawable = gimp_drawable_get (new_layer_id);
}

4
plug-ins/pagecurl/pagecurl.c
View file

@ -739,7 +739,9 @@ do_curl_effect (gint32 drawable_id)
curl_layer_id = curl_layer->drawable_id;
gimp_image_add_layer (image_id, curl_layer->drawable_id, drawable_position);
gimp_image_insert_layer (image_id, curl_layer->drawable_id,
gimp_item_get_parent (drawable_id),
drawable_position);
gimp_drawable_fill (curl_layer->drawable_id, GIMP_TRANSPARENT_FILL);
gimp_drawable_offsets (drawable_id, &x1, &y1);

2
plug-ins/selection-to-path/selection-to-path.c
View file

@ -477,7 +477,7 @@ do_points (spline_list_array_type in_splines,
sel_x1, sel_y1 + sel_height + 1);
}
gimp_image_add_vectors (image_ID, vectors, -1);
gimp_image_insert_vectors (image_ID, vectors, -1, -1);
}

4
plug-ins/twain/twain.c
View file

@ -570,8 +570,8 @@ beginTransferCallback(pTW_IMAGEINFO imageInfo, void *clientData)
layerType, 100, GIMP_NORMAL_MODE);
/* Add the layer to the image */
gimp_image_add_layer(theClientData->image_id,
theClientData->layer_id, 0);
gimp_image_insert_layer(theClientData->image_id,
theClientData->layer_id, -1, 0);
/* Update the progress dialog */
theClientData->totalPixels = imageInfo->ImageWidth * imageInfo->ImageLength;

2
plug-ins/win-snap/winsnap.c
View file

@ -1155,7 +1155,7 @@ sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect)
layer_id = gimp_layer_new(image_id, _("Background"),
ROUND4(width), height,
layerType, 100, GIMP_NORMAL_MODE);
gimp_image_add_layer(image_id, layer_id, 0);
gimp_image_insert_layer(image_id, layer_id, -1, 0);
/* Get our drawable */
drawable = gimp_drawable_get(layer_id);