dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gimp/app/core/gimpimage-merge.h

44 lines
2.1 KiB
C
Raw Normal View History

In all files, changed the standard copyright notice to say "GIMP - The GNU 2006-12-09 Sven Neumann <sven@gimp.org> * In all files, changed the standard copyright notice to say "GIMP - The GNU Image Manipulation Program".
2006-12-10 05:33:38 +08:00
/* GIMP - The GNU Image Manipulation Program
added "const gchar *undo_desc" to gimp_image_merge_layers() so the undo 2003-02-17 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-merge.[ch]: added "const gchar *undo_desc" to gimp_image_merge_layers() so the undo steps say "Merge Down", "Flatten Image" etc. instead of always "Merge Layers".
2003-02-17 19:21:35 +08:00
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
app/color_area.[ch] app/color_panel.[ch] enabled dnd for colors 1999-08-22 Michael Natterer <mitschel@cs.tu-berlin.de> * app/color_area.[ch] * app/color_panel.[ch] * app/gimpdnd.[ch]: enabled dnd for colors (compatible with the standard gtk/gnome color dnd). The color selection is now invoked on a real click, not on button_down to avoid confusion with dnd. * app/channels_dialog.c * app/disp_callbacks.c * app/interface.c * app/layers_dialog.c: minor dnd updates/fixes. * app/channel.[ch] * app/channel_pvt.h * app/docindex.[ch] * app/docindexif.[ch] * app/drawable.[ch] * app/floating_sel.c * app/gimage.[ch] * app/gimage_mask.c * app/gimpdrawable.[ch] * app/gimpdrawableP.h * app/gimpimage.[ch] * app/gimpimageP.h * app/layer.[ch] * app/layer_pvt.h * app/undo.c * app/xcf.c: wanted to do some s/int/gboolean/ in the layer files where appropriate and found myself spending the whole night doing a big code review for layers/channels/drawables/images: s/int/gboolean/, s/<type>/g<type>/, lots of indentation, removed some old global variables and deprecated functions, #include cleanups, proper prototypes, copyright headers, ...
1999-08-22 19:45:31 +08:00
*
Change licence to GPLv3 (and to LGPLv3 for libgimp). 2009-01-17 Michael Natterer <mitch@gimp.org> * all files with a GPL header and all COPYING files: Change licence to GPLv3 (and to LGPLv3 for libgimp). Cleaned up some copyright headers and regenerated the parsers in the ImageMap plugin. svn path=/trunk/; revision=27913
2009-01-18 06:28:01 +08:00
* This program is free software: you can redistribute it and/or modify
app/color_area.[ch] app/color_panel.[ch] enabled dnd for colors 1999-08-22 Michael Natterer <mitschel@cs.tu-berlin.de> * app/color_area.[ch] * app/color_panel.[ch] * app/gimpdnd.[ch]: enabled dnd for colors (compatible with the standard gtk/gnome color dnd). The color selection is now invoked on a real click, not on button_down to avoid confusion with dnd. * app/channels_dialog.c * app/disp_callbacks.c * app/interface.c * app/layers_dialog.c: minor dnd updates/fixes. * app/channel.[ch] * app/channel_pvt.h * app/docindex.[ch] * app/docindexif.[ch] * app/drawable.[ch] * app/floating_sel.c * app/gimage.[ch] * app/gimage_mask.c * app/gimpdrawable.[ch] * app/gimpdrawableP.h * app/gimpimage.[ch] * app/gimpimageP.h * app/layer.[ch] * app/layer_pvt.h * app/undo.c * app/xcf.c: wanted to do some s/int/gboolean/ in the layer files where appropriate and found myself spending the whole night doing a big code review for layers/channels/drawables/images: s/int/gboolean/, s/<type>/g<type>/, lots of indentation, removed some old global variables and deprecated functions, #include cleanups, proper prototypes, copyright headers, ...
1999-08-22 19:45:31 +08:00
* it under the terms of the GNU General Public License as published by
Change licence to GPLv3 (and to LGPLv3 for libgimp). 2009-01-17 Michael Natterer <mitch@gimp.org> * all files with a GPL header and all COPYING files: Change licence to GPLv3 (and to LGPLv3 for libgimp). Cleaned up some copyright headers and regenerated the parsers in the ImageMap plugin. svn path=/trunk/; revision=27913
2009-01-18 06:28:01 +08:00
* the Free Software Foundation; either version 3 of the License, or
app/color_area.[ch] app/color_panel.[ch] enabled dnd for colors 1999-08-22 Michael Natterer <mitschel@cs.tu-berlin.de> * app/color_area.[ch] * app/color_panel.[ch] * app/gimpdnd.[ch]: enabled dnd for colors (compatible with the standard gtk/gnome color dnd). The color selection is now invoked on a real click, not on button_down to avoid confusion with dnd. * app/channels_dialog.c * app/disp_callbacks.c * app/interface.c * app/layers_dialog.c: minor dnd updates/fixes. * app/channel.[ch] * app/channel_pvt.h * app/docindex.[ch] * app/docindexif.[ch] * app/drawable.[ch] * app/floating_sel.c * app/gimage.[ch] * app/gimage_mask.c * app/gimpdrawable.[ch] * app/gimpdrawableP.h * app/gimpimage.[ch] * app/gimpimageP.h * app/layer.[ch] * app/layer_pvt.h * app/undo.c * app/xcf.c: wanted to do some s/int/gboolean/ in the layer files where appropriate and found myself spending the whole night doing a big code review for layers/channels/drawables/images: s/int/gboolean/, s/<type>/g<type>/, lots of indentation, removed some old global variables and deprecated functions, #include cleanups, proper prototypes, copyright headers, ...
1999-08-22 19:45:31 +08:00
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
Change licence to GPLv3 (and to LGPLv3 for libgimp). 2009-01-17 Michael Natterer <mitch@gimp.org> * all files with a GPL header and all COPYING files: Change licence to GPLv3 (and to LGPLv3 for libgimp). Cleaned up some copyright headers and regenerated the parsers in the ImageMap plugin. svn path=/trunk/; revision=27913
2009-01-18 06:28:01 +08:00
* along with this program. If not, see <http://www.gnu.org/licenses/>.
app/color_area.[ch] app/color_panel.[ch] enabled dnd for colors 1999-08-22 Michael Natterer <mitschel@cs.tu-berlin.de> * app/color_area.[ch] * app/color_panel.[ch] * app/gimpdnd.[ch]: enabled dnd for colors (compatible with the standard gtk/gnome color dnd). The color selection is now invoked on a real click, not on button_down to avoid confusion with dnd. * app/channels_dialog.c * app/disp_callbacks.c * app/interface.c * app/layers_dialog.c: minor dnd updates/fixes. * app/channel.[ch] * app/channel_pvt.h * app/docindex.[ch] * app/docindexif.[ch] * app/drawable.[ch] * app/floating_sel.c * app/gimage.[ch] * app/gimage_mask.c * app/gimpdrawable.[ch] * app/gimpdrawableP.h * app/gimpimage.[ch] * app/gimpimageP.h * app/layer.[ch] * app/layer_pvt.h * app/undo.c * app/xcf.c: wanted to do some s/int/gboolean/ in the layer files where appropriate and found myself spending the whole night doing a big code review for layers/channels/drawables/images: s/int/gboolean/, s/<type>/g<type>/, lots of indentation, removed some old global variables and deprecated functions, #include cleanups, proper prototypes, copyright headers, ...
1999-08-22 19:45:31 +08:00
*/
app/color_picker.c app/convert.c app/curves.c app/gimpdrawable.c 2000-12-13 Sven Neumann <sven@gimp.org> * app/color_picker.c * app/convert.c * app/curves.c * app/gimpdrawable.c * app/gimpimage.c * app/gimpimage.h * app/image_map.c * app/info_window.c * app/layer.c * app/undo.c: couldn't resist: renamed TYPE_HAS_ALPHA() to GIMP_IMAGE_TYPE_HAS_ALPHA() * plug-ins/common/sunras.c * plug-ins/common/xwd.c: small cleanups
2000-12-14 02:53:35 +08:00
include the new "paint-funcs/paint-funcs-types.h". 2001-11-28 Michael Natterer <mitch@gimp.org> * app/base/base-types.h: include the new "paint-funcs/paint-funcs-types.h". * app/paint-funcs/Makefile.am * app/paint-funcs/paint-funcs-types.h: new file. Includes "base/base-types.h". * app/paint-funcs/paint-funcs.[ch]: removed the enums here, include "paint-funcs-types.h". * app/widgets/widgets-types.h: include "display/display-types.h" * app/display/display-types.h: include "widgets/widgets-types.h". * app/tools/tools-types.h: include "display/display-types.h" * app/gui/gui-types.h: include "tools/tools-types.h". The order of namespaces/dependencies should be (but is not): (base, paint-funcs) -> (core, file, xcf, pdb) -> (widgets, display) -> tools -> gui * app/path.c: include "tools/tools-types.h". * app/core/Makefile.am * app/core/gimpimage-guides.[ch] * app/core/gimpimage-merge.[ch] * app/core/gimpimage-resize.[ch] * app/core/gimpimage-scale.[ch]: new files. * app/core/gimpimage.[ch]: removed the stuff which is in the new files. Reordered all functions in both the .h and .c files, commented the groups of functions. * app/core/gimpcontainer.c: create the handler_id using a counter, not the address of a pointer, because the address *may* be the same twice, added debugging output. * app/core/gimpviewable.[ch]: added primitive support for getting a preview GdkPixbuf. * app/nav_window.c * app/undo.c * app/undo_history.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-mask.[ch] * app/display/gimpdisplay.c * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-dnd.c * app/display/gimpdisplayshell-render.c * app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scroll.c * app/gui/image-commands.c * app/gui/info-window.c * app/gui/layers-commands.c * app/gui/palette-import-dialog.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/widgets/gimpcontainerview-utils.c * app/xcf/xcf-load.c: changed accordingly, some cleanup. * tools/pdbgen/pdb/guides.pdb * tools/pdbgen/pdb/image.pdb: changed accordingly, reordered functions. * app/plug_in.c: set the labels of the "Repeat" and "Re-Show" menu items to the name of the last plug-in (Fixes #50986). * app/display/gimpdisplayshell.[ch]: set the labels of "Undo" and "Redo" to the resp. undo names. Much simplified the WM icon stuff by removing most code and using gimp_viewable_get_new_preview_pixbuf(). * app/widgets/gimpbrushfactoryview.c: forgot to assign the GQuark returned by gimp_container_add_handler(). * app/pdb/guides_cmds.c * app/pdb/image_cmds.c * libgimp/gimpimage_pdb.[ch]: regenerated.
2001-11-29 01:51:06 +08:00
#ifndef __GIMP_IMAGE_MERGE_H__
#define __GIMP_IMAGE_MERGE_H__
Started doing a GtkObjectifying framework, and started cleaning images from all sorts of ugly dependencies.
1998-06-28 18:39:58 +08:00
app/core/gimpimage-merge.[ch] added GError parameters. 2007-12-06 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-merge.[ch] * app/core/gimpimage-convert.[ch]: added GError parameters. * app/dialogs/convert-dialog.c * app/actions/image-commands.c * app/actions/vectors-commands.c: handle the returned error. * tools/pdbgen/pdb/convert.pdb: pass the error. * app/pdb/convert_cmds.c: regenerated. svn path=/trunk/; revision=24276
2007-12-07 03:51:02 +08:00
GimpLayer * gimp_image_merge_visible_layers (GimpImage *image,
GimpContext *context,
GimpMergeType merge_type,
Bug 625167 - Problem exporting floating selections from within layer groups Add "gboolean merge_active_group" to gimp_image_merge_visible_layers() and pass FALSE from the PDB wrapper so plug-in invoked layer merging always acts on the toplevel container as it did in 2.6. Do the same when opening an image as layer. Also, added a "Merge within active group only" toggle to the merge layers dialog and pass it down to the core, but default to TRUE here so.
2011-02-14 16:45:59 +08:00
gboolean merge_active_group,
app/core/gimpimage-merge.[ch] added GError parameters. 2007-12-06 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-merge.[ch] * app/core/gimpimage-convert.[ch]: added GError parameters. * app/dialogs/convert-dialog.c * app/actions/image-commands.c * app/actions/vectors-commands.c: handle the returned error. * tools/pdbgen/pdb/convert.pdb: pass the error. * app/pdb/convert_cmds.c: regenerated. svn path=/trunk/; revision=24276
2007-12-07 03:51:02 +08:00
gboolean discard_invisible);
GimpLayer * gimp_image_merge_down (GimpImage *image,
GimpLayer *current_layer,
GimpContext *context,
Add GError reporting to gimp_image_merge_down() - turn g_return_if_fail() of more complex conditions into errors. - change PDB wrapper accordingly instead of adding a ton of conditions there.
2009-08-26 04:02:02 +08:00
GimpMergeType merge_type,
GError **error);
Add gimp_image_merge_group_layer() The new function replaces a group layer by a normal one that looks exactly the same.
2009-09-22 01:08:04 +08:00
GimpLayer * gimp_image_merge_group_layer (GimpImage *image,
GimpGroupLayer *group);
app/core/gimpimage-merge.[ch] added GError parameters. 2007-12-06 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-merge.[ch] * app/core/gimpimage-convert.[ch]: added GError parameters. * app/dialogs/convert-dialog.c * app/actions/image-commands.c * app/actions/vectors-commands.c: handle the returned error. * tools/pdbgen/pdb/convert.pdb: pass the error. * app/pdb/convert_cmds.c: regenerated. svn path=/trunk/; revision=24276
2007-12-07 03:51:02 +08:00
GimpLayer * gimp_image_flatten (GimpImage *image,
app: return a GError when flattening the image failed
2013-08-10 03:31:55 +08:00
GimpContext *context,
GError **error);
Add gimp_image_merge_group_layer() The new function replaces a group layer by a normal one that looks exactly the same.
2009-09-22 01:08:04 +08:00
app/core/gimpimage-merge.[ch] added GError parameters. 2007-12-06 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-merge.[ch] * app/core/gimpimage-convert.[ch]: added GError parameters. * app/dialogs/convert-dialog.c * app/actions/image-commands.c * app/actions/vectors-commands.c: handle the returned error. * tools/pdbgen/pdb/convert.pdb: pass the error. * app/pdb/convert_cmds.c: regenerated. svn path=/trunk/; revision=24276
2007-12-07 03:51:02 +08:00
GimpVectors * gimp_image_merge_visible_vectors (GimpImage *image,
GError **error);
app/color_picker.c app/convert.c app/curves.c app/gimpdrawable.c 2000-12-13 Sven Neumann <sven@gimp.org> * app/color_picker.c * app/convert.c * app/curves.c * app/gimpdrawable.c * app/gimpimage.c * app/gimpimage.h * app/image_map.c * app/info_window.c * app/layer.c * app/undo.c: couldn't resist: renamed TYPE_HAS_ALPHA() to GIMP_IMAGE_TYPE_HAS_ALPHA() * plug-ins/common/sunras.c * plug-ins/common/xwd.c: small cleanups
2000-12-14 02:53:35 +08:00
Started doing a GtkObjectifying framework, and started cleaning images from all sorts of ugly dependencies.
1998-06-28 18:39:58 +08:00
include the new "paint-funcs/paint-funcs-types.h". 2001-11-28 Michael Natterer <mitch@gimp.org> * app/base/base-types.h: include the new "paint-funcs/paint-funcs-types.h". * app/paint-funcs/Makefile.am * app/paint-funcs/paint-funcs-types.h: new file. Includes "base/base-types.h". * app/paint-funcs/paint-funcs.[ch]: removed the enums here, include "paint-funcs-types.h". * app/widgets/widgets-types.h: include "display/display-types.h" * app/display/display-types.h: include "widgets/widgets-types.h". * app/tools/tools-types.h: include "display/display-types.h" * app/gui/gui-types.h: include "tools/tools-types.h". The order of namespaces/dependencies should be (but is not): (base, paint-funcs) -> (core, file, xcf, pdb) -> (widgets, display) -> tools -> gui * app/path.c: include "tools/tools-types.h". * app/core/Makefile.am * app/core/gimpimage-guides.[ch] * app/core/gimpimage-merge.[ch] * app/core/gimpimage-resize.[ch] * app/core/gimpimage-scale.[ch]: new files. * app/core/gimpimage.[ch]: removed the stuff which is in the new files. Reordered all functions in both the .h and .c files, commented the groups of functions. * app/core/gimpcontainer.c: create the handler_id using a counter, not the address of a pointer, because the address *may* be the same twice, added debugging output. * app/core/gimpviewable.[ch]: added primitive support for getting a preview GdkPixbuf. * app/nav_window.c * app/undo.c * app/undo_history.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-mask.[ch] * app/display/gimpdisplay.c * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-dnd.c * app/display/gimpdisplayshell-render.c * app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scroll.c * app/gui/image-commands.c * app/gui/info-window.c * app/gui/layers-commands.c * app/gui/palette-import-dialog.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/widgets/gimpcontainerview-utils.c * app/xcf/xcf-load.c: changed accordingly, some cleanup. * tools/pdbgen/pdb/guides.pdb * tools/pdbgen/pdb/image.pdb: changed accordingly, reordered functions. * app/plug_in.c: set the labels of the "Repeat" and "Re-Show" menu items to the name of the last plug-in (Fixes #50986). * app/display/gimpdisplayshell.[ch]: set the labels of "Undo" and "Redo" to the resp. undo names. Much simplified the WM icon stuff by removing most code and using gimp_viewable_get_new_preview_pixbuf(). * app/widgets/gimpbrushfactoryview.c: forgot to assign the GQuark returned by gimp_container_add_handler(). * app/pdb/guides_cmds.c * app/pdb/image_cmds.c * libgimp/gimpimage_pdb.[ch]: regenerated.
2001-11-29 01:51:06 +08:00
#endif /* __GIMP_IMAGE_MERGE_H__ */