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

add new functions gimp_image_get_layer_iter(), channel_iter() and

Browse Source 
2008-11-02  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimage.[ch]: add new functions
	gimp_image_get_layer_iter(), channel_iter() and vectors_iter()
	which return the GList inside the resp. GimpList.

	* app/actions/channels-actions.c
	* app/actions/layers-actions.c
	* app/actions/vectors-actions.c
	* app/core/gimpimage-convert.c
	* app/core/gimpimage-crop.c
	* app/core/gimpimage-duplicate.c
	* app/core/gimpimage-flip.c
	* app/core/gimpimage-item-list.c
	* app/core/gimpimage-merge.c
	* app/core/gimpimage-resize.c
	* app/core/gimpimage-rotate.c
	* app/core/gimpimage-scale.c
	* app/core/gimpimage.c
	* app/core/gimpimage.h
	* app/core/gimpprojection-construct.c
	* app/display/gimpdisplayshell-draw.c
	* app/file/file-open.c
	* app/tools/gimpaligntool.c
	* app/tools/gimpdrawtool.c
	* app/vectors/gimpvectors-compat.c
	* app/vectors/gimpvectors-export.c
	* app/widgets/gimplayertreeview.c
	* app/xcf/xcf-save.c
	* tools/pdbgen/pdb/image.pdb: use the new functions instead of
	peeking both into the image and the list. Remove inclusions of
	"gimplist.h" or change them into "gimpcontainer.h" if needed.

	* app/pdb/image-cmds.c: regenerated.


svn path=/trunk/; revision=27524
This commit is contained in:
Michael Natterer
2008-11-02 20:46:57 +00:00
committed by Michael Natterer
parent c14c84ba63
commit d1ca165b4e
26 changed files with 154 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/core/gimpimage-merge.c
View File

@ -35,6 +35,7 @@
#include "vectors/gimpvectors.h"
#include "gimp.h"
#include "gimpcontainer.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimpimage-colorhash.h"
@ -43,7 +44,6 @@
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayermask.h"
#include "gimplist.h"
#include "gimpmarshal.h"
#include "gimpparasitelist.h"
#include "gimpundostack.h"
@ -81,7 +81,7 @@ gimp_image_merge_visible_layers (GimpImage *image,
had_floating_sel = TRUE;
}
for (list = GIMP_LIST (image->layers)->list;
for (list = gimp_image_get_layer_iter (image);
list;
list = g_list_next (list))
{
@ -151,7 +151,7 @@ gimp_image_flatten (GimpImage *image,
if (gimp_image_floating_sel (image))
floating_sel_anchor (image->floating_sel);
for (list = GIMP_LIST (image->layers)->list;
for (list = gimp_image_get_layer_iter (image);
list;
list = g_list_next (list))
{
@ -186,7 +186,7 @@ gimp_image_merge_down (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
for (list = GIMP_LIST (image->layers)->list, layer_list = NULL;
for (list = gimp_image_get_layer_iter (image), layer_list = NULL;
list && !layer_list;
list = g_list_next (list))
{
@ -236,7 +236,7 @@ gimp_image_merge_visible_vectors (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
for (list = GIMP_LIST (image->vectors)->list;
for (list = gimp_image_get_vectors_iter (image);
list;
list = g_list_next (list))
{
@ -584,7 +584,7 @@ gimp_image_merge_layers (GimpImage *image,
/* if the type is flatten, remove all the remaining layers */
if (merge_type == GIMP_FLATTEN_IMAGE)
{
list = GIMP_LIST (image->layers)->list;
list = gimp_image_get_layer_iter (image);
while (list)
{
layer = list->data;