[gimp/gimp-attributes-wip: 128/129] Periodically merge with master to be up to date
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 128/129] Periodically merge with master to be up to date
- Date: Sat, 30 May 2015 15:22:58 +0000 (UTC)
commit 21b7f5317bdd8a8a20aef70be3cbacddd1133364
Merge: 314abc4 4d9cf01
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat May 30 17:17:34 2015 +0200
Periodically merge with master to be up to date
Conflicts:
plug-ins/common/metadata.c
plug-ins/file-psd/psd-save.c
app/actions/buffers-commands.c | 23 +-
app/actions/context-commands.c | 2 +-
app/actions/filters-actions.c | 6 +
app/actions/layers-commands.c | 2 +-
app/config/Makefile.am | 5 +-
app/config/gimpcoreconfig.c | 81 +-
app/config/gimpcoreconfig.h | 3 +
app/config/gimprc-blurbs.h | 8 +
app/core/core-enums.c | 4 +-
app/core/core-enums.h | 11 +-
app/core/gimpbrushpipe.c | 6 +-
app/core/gimpcontext.c | 26 +
app/core/gimpdynamics.c | 15 +-
app/core/gimpdynamics.h | 3 +
app/core/gimpimage.c | 6 +
app/core/gimpviewable.c | 14 +-
app/dialogs/file-open-dialog.c | 11 -
app/dialogs/preferences-dialog.c | 16 +
app/display/gimpdisplayshell-dnd.c | 2 +-
app/display/gimpdisplayshell-tool-events.c | 14 +-
app/display/gimptoolgui.c | 15 +-
app/file/file-open.c | 14 +-
app/gegl/gimp-gegl-nodes.c | 3 +-
app/main.c | 34 +
app/operations/gimplayermodefunctions.c | 3 +-
app/operations/gimpoperationoverlaymode.c | 7 +-
app/operations/gimpoperationsoftlightmode.c | 16 +-
app/paint/gimpbrushcore.c | 34 +-
app/paint/gimpclone.c | 36 +-
app/paint/gimpdodgeburn.c | 20 +-
app/paint/gimperaser.c | 20 +-
app/paint/gimpheal.c | 42 +-
app/paint/gimppaintbrush.c | 20 +-
app/paint/gimppaintoptions.c | 31 +-
app/paint/gimpsmudge.c | 52 +-
app/pdb/brush-select-cmds.c | 6 +
app/pdb/brushes-cmds.c | 3 +
app/pdb/context-cmds.c | 3 +
app/pdb/edit-cmds.c | 9 +
app/pdb/internal-procs.c | 2 +-
app/pdb/layer-cmds.c | 6 +
app/pdb/plug-in-compat-cmds.c | 175 +
app/sanity.c | 5 +-
app/tests/Makefile.am | 3 +
app/tools/gimpforegroundselectoptions.c | 6 +-
app/tools/gimpgegltool.c | 4 +
app/tools/gimpmybrushoptions-gui.c | 140 +-
app/tools/gimptransformoptions.c | 50 +-
app/tools/gimptransformtool.c | 41 +-
app/widgets/gimpcursor.c | 175 +-
app/widgets/gimphelp-ids.h | 1 +
app/widgets/gimpimageprofileview.c | 4 +-
app/widgets/gimpoverlaydialog.c | 56 +-
app/widgets/gimpoverlaydialog.h | 5 +
app/widgets/gimpwidgets-constructors.c | 2 +-
app/widgets/gimpwidgets-utils.c | 45 -
app/widgets/gimpwidgets-utils.h | 9 +-
app/xcf/xcf-load.c | 4 +
app/xcf/xcf-save.c | 3 +
app/xcf/xcf.c | 3 +-
build/windows/jhbuild/compresslibs.moduleset | 6 +-
build/windows/jhbuild/glib.moduleset | 12 +-
build/windows/jhbuild/gtk+.moduleset | 13 +-
build/windows/jhbuild/imglibs.moduleset | 8 +-
build/windows/jhbuild/mkarchive | 3 +-
.../jhbuild/patches/gtk-horiz-scrolling.patch | 65 +
configure.ac | 7 +-
cursors/.gitignore | 8 +-
cursors/Makefile.am | 55 +-
devel-docs/libgimp/tmpl/gimpenums.sgml | 1 +
docs/gimprc.5.in | 43 +-
etc/gimprc | 29 +-
icons/.gitignore | 6 +-
icons/Makefile.am | 53 +-
libgimp/gimp.c | 34 +
libgimp/gimpenums.h | 3 +-
libgimpbase/gimpbaseenums.h | 8 +-
libgimpcolor/gimpcolor.def | 2 +
libgimpcolor/gimpcolortypes.h | 1 +
libgimpcolor/gimplcms.c | 289 +-
libgimpcolor/gimplcms.h | 4 +
libgimpconfig/gimpcolorconfig.c | 102 +
libgimpconfig/gimpcolorconfig.h | 11 +-
libgimpconfig/gimpconfig.def | 4 +
libgimpwidgets/Makefile.am | 7 +-
libgimpwidgets/gimpcolorprofilechooserdialog.c | 4 +-
libgimpwidgets/gimpcolorprofilecombobox.c | 10 +-
libgimpwidgets/gimpcolorprofileview.c | 2 -
libgimpwidgets/gimpfileentry.c | 19 +
libgimpwidgets/gimppickbutton.c | 25 +-
libgimpwidgets/gimpstock.c | 19 +-
libgimpwidgets/gimpwidgets.c | 255 -
libgimpwidgets/gimpwidgets.def | 6 +
libgimpwidgets/gimpwidgets.h | 20 +-
libgimpwidgets/gimpwidgetsutils.c | 611 ++
libgimpwidgets/gimpwidgetsutils.h | 60 +
menus/image-menu.xml.in | 1 +
modules/color-selector-cmyk.c | 37 +-
modules/display-filter-lcms.c | 353 +-
modules/display-filter-proof.c | 11 +-
plug-ins/common/.gitignore | 2 -
plug-ins/common/Makefile.am | 18 -
plug-ins/common/animation-play.c | 4 +-
plug-ins/common/file-psp.c | 2 +-
plug-ins/common/gimprc.common | 1 -
plug-ins/common/lcms.c | 148 +-
plug-ins/common/plugin-defs.pl | 1 -
plug-ins/common/tile-paper.c | 952 --
plug-ins/file-jpeg/jpeg-load.c | 54 +-
plug-ins/file-psd/.gitignore | 6 +-
plug-ins/file-psd/Makefile.am | 35 +-
plug-ins/file-psd/psd-image-res-load.c | 42 +-
plug-ins/file-psd/psd-load.c | 273 +-
plug-ins/file-psd/psd-save.c | 185 +-
plug-ins/file-psd/psd-save.h | 27 +
plug-ins/file-psd/psd-util.c | 18 +-
plug-ins/file-psd/psd.c | 91 +-
plug-ins/file-psd/psd.h | 6 -
plug-ins/pygimp/gimpenums-types.defs | 1 +
plug-ins/pygimp/plug-ins/file-openraster.py | 2 +-
plug-ins/script-fu/scripts/ripply-anim.scm | 168 +-
plug-ins/script-fu/tinyscheme/scheme.c | 3 +
po-libgimp/is.po | 91 +-
po-libgimp/it.po | 45 +-
po-libgimp/sr.po | 1401 ++-
po-plug-ins/POTFILES.in | 1 -
po-plug-ins/ca.po | 2 +-
po-plug-ins/ru.po | 8181 ++++++++--------
po/POTFILES.in | 1 +
po/is.po | 305 +-
po/it.po | 673 +-
po/pl.po | 313 +-
po/ru.po | 9891 ++++++++++++--------
tools/generate-news | 30 +
tools/pdbgen/enums.pl | 6 +-
tools/pdbgen/pdb/brush_select.pdb | 6 +
tools/pdbgen/pdb/brushes.pdb | 3 +
tools/pdbgen/pdb/context.pdb | 3 +
tools/pdbgen/pdb/edit.pdb | 9 +
tools/pdbgen/pdb/layer.pdb | 6 +
tools/pdbgen/pdb/plug_in_compat.pdb | 99 +
141 files changed, 14926 insertions(+), 11751 deletions(-)
---
diff --cc app/pdb/internal-procs.c
index 0a1a3e3,de885f7..eb37538
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@@ -28,7 -28,7 +28,7 @@@
#include "internal-procs.h"
- /* 754 procedures registered total */
-/* 755 procedures registered total */
++/* 757 procedures registered total */
void
internal_procs_init (GimpPDB *pdb)
diff --cc plug-ins/file-psd/psd.c
index 1310dc0,96476fa..22399e7
--- a/plug-ins/file-psd/psd.c
+++ b/plug-ins/file-psd/psd.c
@@@ -276,13 -259,18 +259,18 @@@ run (const gchar *name
}
}
}
-
- #ifdef PSD_SAVE
- /* File save */
else if (strcmp (name, SAVE_PROC) == 0)
{
- image_ID = param[1].data.d_int32;
- drawable_ID = param[2].data.d_int32;
+ gint32 drawable_id;
- GimpMetadata *metadata;
++ GimpAttributes *attributes;
+ GimpMetadataSaveFlags metadata_flags;
+ GimpExportReturn export = GIMP_EXPORT_IGNORE;
+
+ IFDBG(2) g_debug ("\n---------------- %s ----------------\n",
+ param[3].data.d_string);
+
+ image_ID = param[1].data.d_int32;
+ drawable_id = param[2].data.d_int32;
switch (run_mode)
{
@@@ -308,22 -297,46 +297,46 @@@
break;
}
- if (status == GIMP_PDB_SUCCESS)
- metadata = gimp_image_metadata_save_prepare (image_ID,
++ attributes = gimp_image_metadata_save_prepare (image_ID,
+ "image/x-psd",
+ &metadata_flags);
+
+ if (save_image (param[3].data.d_string, image_ID, &error))
{
- if (save_image (param[3].data.d_string, image_ID, drawable_ID,
- &error))
- if (metadata)
++ if (attributes)
{
+ GFile *file;
+
- gimp_metadata_set_bits_per_sample (metadata, 8);
++ gimp_attributes_new_attribute (attributes, "Exif.Image.BitsPerSample", "8", TYPE_SHORT);
+
+ file = g_file_new_for_path (param[3].data.d_string);
+ gimp_image_metadata_save_finish (image_ID,
+ "image/x-psd",
- metadata, metadata_flags,
++ attributes, metadata_flags,
+ file, NULL);
+ g_object_unref (file);
++
++ g_object_unref (attributes);
}
- else
+
+ values[0].data.d_status = GIMP_PDB_SUCCESS;
+ }
+ else
+ {
+ values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
+
+ if (error)
{
- status = GIMP_PDB_EXECUTION_ERROR;
+ *nreturn_vals = 2;
+ values[1].type = GIMP_PDB_STRING;
+ values[1].data.d_string = error->message;
}
}
if (export == GIMP_EXPORT_EXPORT)
gimp_image_delete (image_ID);
+
- if (metadata)
- g_object_unref (metadata);
}
- #endif /* PSD_SAVE */
/* Unknown procedure */
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
