[gimp/gimp-attributes-wip: 88/88] Periodically merge with master to stay up-to-date
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 88/88] Periodically merge with master to stay up-to-date
- Date: Mon, 10 Aug 2015 18:13:57 +0000 (UTC)
commit c6e5391de59f054cf22d7b0ef371fa3edd97c0b8
Merge: 23ac3d2 c402f10
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Mon Aug 10 19:21:16 2015 +0200
Periodically merge with master to stay up-to-date
Conflicts:
app/pdb/internal-procs.c
app/actions/image-actions.c | 2 +-
app/actions/image-commands.c | 82 +-
app/actions/layers-commands.c | 14 +-
app/config/Makefile.am | 8 +-
app/config/gimpcoreconfig.c | 2 +-
app/core/Makefile.am | 4 +-
app/core/gimpchannel.c | 133 +-
app/core/gimpchannel.h | 10 -
app/core/gimpdatafactory.c | 52 +-
app/core/gimpimage-arrange.c | 156 +-
...mpimage-profile.c => gimpimage-color-profile.c} | 125 +-
...mpimage-profile.h => gimpimage-color-profile.h} | 19 +-
app/core/gimpimage-convert-type.c | 2 +-
app/core/gimpimage-crop.c | 45 +-
app/core/gimpimage-crop.h | 8 +-
app/core/gimpimage-item-list.c | 80 +-
app/core/gimpimage-item-list.h | 73 +-
app/core/gimpimage-new.c | 2 +-
app/core/gimpimage-resize.c | 21 +-
app/core/gimpimage.c | 53 +-
app/core/gimpimage.h | 4 -
app/core/gimpimageundo.c | 2 +-
app/core/gimpitem-linked.c | 25 +-
app/core/gimpitem.c | 113 +-
app/core/gimpitem.h | 16 +
app/core/gimpitemtree.c | 16 +-
app/core/gimpmaskundo.c | 52 +-
app/core/gimppalette-import.c | 7 +-
app/core/gimppickable-auto-shrink.c | 6 +
app/core/gimpselection.c | 30 +-
app/dialogs/Makefile.am | 2 +
app/dialogs/color-profile-dialog.c | 426 +
app/dialogs/color-profile-dialog.h | 36 +
app/dialogs/file-save-dialog.c | 14 +-
app/dialogs/preferences-dialog.c | 54 +-
app/display/gimpcursorview.c | 40 +-
app/display/gimpdisplayshell-profile.c | 5 +
app/display/gimpdisplayshell-selection.c | 7 +-
app/display/gimpdisplayshell-title.c | 2 +-
app/display/gimpdisplayshell.c | 84 +-
app/display/gimpdisplayshell.h | 8 +-
app/file/file-open.c | 2 +-
app/operations/tests/Makefile.am | 8 +-
app/paint/gimppaintcore-loops.c | 4 +-
app/pdb/image-cmds.c | 13 +-
app/pdb/image-color-profile-cmds.c | 274 +-
app/pdb/image-transform-cmds.c | 2 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/layer-cmds.c | 2 +-
app/pdb/plug-in-compat-cmds.c | 983 ++-
app/pdb/selection-cmds.c | 11 +-
app/tests/Makefile.am | 8 +-
app/tests/test-core.c | 1 +
app/tests/test-ui.c | 15 +-
app/tests/test-xcf.c | 15 +-
app/text/gimpfont.c | 2 +-
app/text/gimpfontlist.c | 2 +-
app/text/gimptext.c | 2 +-
app/tools/gimpalignoptions.h | 2 +-
app/tools/gimpaligntool.c | 23 +-
app/tools/gimpcropoptions.h | 3 +-
app/tools/gimpcroptool.c | 2 +-
app/tools/gimpeditselectiontool.c | 659 +-
app/tools/gimpmoveoptions.h | 2 +-
app/tools/gimprectangleselectoptions.h | 2 +-
app/tools/gimprectangleselecttool.c | 12 +-
app/tools/gimpseamlesscloneoptions.c | 24 +-
app/tools/gimpseamlesscloneoptions.h | 2 +-
app/tools/gimpseamlessclonetool.c | 12 +-
app/tools/gimptransformtool.c | 8 +-
app/vectors/gimpvectors.c | 140 +-
app/vectors/gimpvectors.h | 8 +-
app/widgets/gimpdnd-xds.c | 24 +-
app/widgets/gimpimageprofileview.c | 8 +-
app/widgets/gimptagpopup.c | 2 +-
app/xcf/xcf-load.c | 2 +-
app/xcf/xcf-private.h | 2 +-
app/xcf/xcf-save.c | 4 +-
app/xcf/xcf.c | 50 +-
build/windows/jhbuild/build.jhbuildrc | 2 +
build/windows/jhbuild/gtk+.moduleset | 34 +-
build/windows/jhbuild/imglibs.moduleset | 23 +-
build/windows/jhbuild/misclibs.moduleset | 22 +-
.../jhbuild/patches/librsvg-bug710163.patch | 36 -
.../jhbuild/patches/poppler-windows-h.patch | 10 +
libgimp/gimp.def | 2 +
libgimp/gimp.h | 6 +-
libgimp/gimpfontselectbutton.c | 2 +-
libgimp/gimpimagecolorprofile.c | 72 +-
libgimp/gimpimagecolorprofile.h | 17 +-
libgimp/gimpimagecolorprofile_pdb.c | 135 +-
libgimp/gimpimagecolorprofile_pdb.h | 30 +-
libgimpcolor/gimpcolor.def | 10 +-
libgimpcolor/gimpcolormanaged.c | 2 +-
libgimpcolor/gimpcolormanaged.h | 12 +-
libgimpcolor/gimpcolorprofile.c | 544 +-
libgimpcolor/gimpcolorprofile.h | 93 +-
libgimpcolor/gimpcolortypes.h | 2 +-
libgimpcolor/gimppixbuf.c | 5 +-
libgimpconfig/gimpcolorconfig.c | 52 +-
libgimpconfig/gimpcolorconfig.h | 20 +-
libgimpwidgets/gimpcolorprofilechooserdialog.c | 6 +-
libgimpwidgets/gimpcolorprofilecombobox.c | 156 +-
libgimpwidgets/gimpcolorprofilecombobox.h | 12 +
libgimpwidgets/gimpcolorprofilestore-private.h | 4 +-
libgimpwidgets/gimpcolorprofilestore.c | 132 +-
libgimpwidgets/gimpcolorprofilestore.h | 9 +-
libgimpwidgets/gimpcolorprofileview.c | 65 +-
libgimpwidgets/gimpcolorprofileview.h | 2 +-
libgimpwidgets/gimpwidgets.def | 4 +
libgimpwidgets/gimpwidgetsutils.c | 57 +-
libgimpwidgets/gimpwidgetsutils.h | 46 +-
menus/image-menu.xml.in | 8 +-
modules/color-selector-cmyk.c | 37 +-
modules/display-filter-lcms.c | 51 +-
modules/display-filter-proof.c | 45 +-
plug-ins/common/.gitignore | 4 -
plug-ins/common/Makefile.am | 40 -
plug-ins/common/bump-map.c | 1448 ---
plug-ins/common/displace.c | 860 --
plug-ins/common/file-pdf-save.c | 31 +-
plug-ins/common/file-png.c | 2 +
plug-ins/common/gimprc.common | 2 -
plug-ins/common/lcms.c | 464 +-
plug-ins/common/plugin-defs.pl | 4 +-
plug-ins/file-jpeg/jpeg-load.c | 25 +-
po-libgimp/is.po | 1406 ++-
po-libgimp/it.po | 87 +-
po-libgimp/pt.po | 1945 ++--
po-plug-ins/POTFILES.in | 2 -
po-plug-ins/is.po |10194 +++++++---------
po-plug-ins/it.po | 463 +-
po-python/pt.po | 111 +-
po-script-fu/it.po | 239 +-
po-script-fu/pt.po | 2224 ++--
po-tips/pt.po | 807 +-
po/POTFILES.in | 3 +-
po/ca.po | 6 +-
po/el.po | 566 +-
po/is.po |11412 ++++++++++++------
po/it.po | 1164 +-
po/pt.po |12827 +++++++++++---------
tools/pdbgen/pdb/image.pdb | 13 +-
tools/pdbgen/pdb/image_color_profile.pdb | 183 +-
tools/pdbgen/pdb/image_transform.pdb | 2 +-
tools/pdbgen/pdb/layer.pdb | 2 +-
tools/pdbgen/pdb/plug_in_compat.pdb | 610 +-
tools/pdbgen/pdb/selection.pdb | 11 +-
148 files changed, 28917 insertions(+), 24182 deletions(-)
---
diff --cc libgimp/gimp.def
index fd53eba,6a4ffdf..612385f
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@@ -496,9 -497,9 +497,10 @@@ EXPORT
gimp_image_set_active_channel
gimp_image_set_active_layer
gimp_image_set_active_vectors
+ gimp_image_set_attributes
gimp_image_set_cmap
gimp_image_set_color_profile
+ gimp_image_set_color_profile_from_file
gimp_image_set_colormap
gimp_image_set_component_active
gimp_image_set_component_visible
diff --cc plug-ins/common/plugin-defs.pl
index 74ede91,02ac04e..c6f81af
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@@ -72,11 -69,11 +70,11 @@@
'grid' => { ui => 1 },
'guillotine' => {},
'hot' => { ui => 1 },
+ 'iptc' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'jigsaw' => { ui => 1 },
- 'lcms' => { ui => 1, gegl => 1, libs => 'LCMS_LIBS', cflags => 'LCMS_CFLAGS' },
+ 'lcms' => { ui => 1, gegl => 1 },
'mail' => { ui => 1, optional => 1 },
'max-rgb' => { ui => 1 },
- 'metadata' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'newsprint' => { ui => 1 },
'nl-filter' => { ui => 1 },
'oilify' => { ui => 1 },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
