[gimp/gimp-attributes-wip: 108/714] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 108/714] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sun, 13 Mar 2016 18:08:28 +0000 (UTC)
commit 4b9cd2ce438017d9844588e0405fa195de2b4f23
Merge: 029eae2 d3482a0
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat Nov 28 09:00:42 2015 +0100
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
Conflicts:
app/core/gimpimage.c
app/pdb/internal-procs.c
plug-ins/common/file-png.c
plug-ins/common/file-tiff-load.c
Makefile.am | 1 +
NEWS | 754 +---
NEWS.pre-2-8 | 642 +++
app/actions/dialogs-actions.c | 6 +-
app/actions/dockable-actions.c | 2 +-
app/actions/file-commands.c | 31 +-
app/actions/filters-actions.c | 16 +-
app/actions/image-actions.c | 192 +-
app/actions/image-commands.c | 76 +-
app/actions/image-commands.h | 3 +
app/actions/view-actions.c | 159 +-
app/actions/view-commands.c | 60 +
app/actions/view-commands.h | 7 +
app/core/core-enums.c | 91 -
app/core/core-enums.h | 35 -
app/core/gimp.c | 10 +
app/core/gimpchannel.c | 12 +-
app/core/gimpcontext.c | 17 +-
app/core/gimpdashpattern.c | 63 +-
app/core/gimpdashpattern.h | 5 +
app/core/gimpdrawable.c | 16 +-
app/core/gimpdrawable.h | 6 +-
app/core/gimpgrouplayer.c | 8 +-
app/core/gimpgrouplayerundo.c | 2 +-
app/core/gimpimage-color-profile.c | 86 +-
app/core/gimpimage-convert-precision.c | 78 +-
app/core/gimpimage-convert-type.c | 2 +-
app/core/gimpimage.c | 13 +-
app/core/gimpitem.c | 2 +-
app/core/gimpitem.h | 4 +-
app/core/gimpitemtree.c | 13 +-
app/core/gimplayer-new.c | 2 +-
app/core/gimplayer.c | 83 +-
app/core/gimplayermask.c | 9 +-
app/core/gimppickable-contiguous-region.c | 5 +
app/core/gimpprojection.c | 2 +-
app/core/gimpselection.c | 9 +-
app/core/gimpstrokeoptions.c | 8 +-
app/dialogs/convert-precision-dialog.c | 82 +-
app/dialogs/convert-precision-dialog.h | 10 +-
app/display/gimpcursorview.c | 28 +-
app/display/gimpdisplayshell-icon.c | 50 +-
app/display/gimpdisplayshell-rotate.c | 36 +-
app/display/gimpdisplayshell-rotate.h | 4 +
app/display/gimpdisplayshell-scale.c | 162 +-
app/display/gimpdisplayshell-scale.h | 7 +
app/display/gimpdisplayshell-transform.h | 9 +-
app/display/gimpdisplayshell.c | 7 +-
app/display/gimpdisplayshell.h | 5 +-
app/display/gimpimagewindow.c | 60 +-
app/gegl/gimp-gegl-loops.c | 35 +-
app/gegl/gimp-gegl-loops.h | 6 +-
app/operations/gimpoperationdesaturate.c | 28 +-
app/pdb/brush-cmds.c | 78 +-
app/pdb/context-cmds.c | 823 ++++-
app/pdb/drawable-cmds.c | 3 +
app/pdb/edit-cmds.c | 14 +-
app/pdb/gimppdbcontext.c | 75 +-
app/pdb/gimppdbcontext.h | 17 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/paths-cmds.c | 2 +-
app/sanity.c | 6 +-
app/tests/test-ui.c | 3 +
app/text/gimptextlayer.c | 9 +-
app/text/gimptextundo.c | 2 +-
app/tools/gimpcolorpickertool.c | 1 +
app/tools/gimpcroptool.c | 2 +-
app/tools/gimpcurvestool.c | 20 +-
app/tools/gimpfreeselecttool.c | 181 +-
app/tools/gimpgegltool.c | 4 +-
app/tools/gimpmagnifytool.c | 116 +-
app/tools/gimprectangleselecttool.c | 7 +-
app/tools/gimprectangletool.c | 25 +-
app/tools/gimptransformoptions.c | 26 +-
app/tools/gimpunifiedtransformtool.c | 13 +-
app/vectors/gimpvectors.c | 4 +-
app/widgets/gimpfiledialog.c | 8 +
app/widgets/gimphelp-ids.h | 3 +
app/widgets/gimphelp.c | 22 +-
app/widgets/gimpoverlaybox.c | 2 +-
app/widgets/gimpoverlaychild.c | 44 +
app/widgets/gimptextstyleeditor.c | 2 +
app/widgets/gimpviewrenderer.c | 6 +-
app/widgets/gimpwidgets-utils.c | 20 +
app/widgets/gimpwidgets-utils.h | 6 +-
app/xcf/xcf-save.c | 5 +-
configure.ac | 9 +-
devel-docs/release-howto.txt | 13 +-
docs/gimprc.5.in | 13 +-
etc/gimprc | 12 +-
icons/128/gimp-wilber-outline.png | Bin 0 -> 12537 bytes
icons/128/gimp-wilber.png | Bin 0 -> 11586 bytes
icons/192/gimp-wilber-outline.png | Bin 0 -> 20810 bytes
icons/192/gimp-wilber.png | Bin 0 -> 19452 bytes
icons/256/gimp-wilber-outline.png | Bin 0 -> 29826 bytes
icons/256/gimp-wilber.png | Bin 0 -> 28032 bytes
icons/64/gimp-wilber-outline.png | Bin 0 -> 4842 bytes
icons/96/gimp-wilber-outline.png | Bin 0 -> 8708 bytes
icons/96/gimp-wilber.png | Bin 0 -> 7921 bytes
icons/Makefile.am | 47 +-
...ck-channel-alpha.svg => gimp-channel-alpha.svg} | 0
...hannel-indexed.svg => gimp-channel-indexed.svg} | 0
.../{stock-dynamics.svg => gimp-dynamics.svg} | 0
icons/scalable/{stock-gegl.svg => gimp-gegl.svg} | 0
.../{stock-layer-mask.svg => gimp-layer-mask.svg} | 0
icons/scalable/{stock-layer.svg => gimp-layer.svg} | 0
.../{stock-text-layer.svg => gimp-text-layer.svg} | 0
...{stock-user-manual.svg => gimp-user-manual.svg} | 0
.../{stock-wilber.svg => gimp-wilber-outline.svg} | 358 +-
.../scalable/{stock-wilber.svg => gimp-wilber.svg} | 0
libgimp/gimp.def | 16 +
libgimp/gimpbrush_pdb.c | 89 +-
libgimp/gimpcontext_pdb.c | 537 +++-
libgimp/gimpcontext_pdb.h | 18 +
libgimp/gimpenums.c.tail | 6 +
libgimp/gimpimage.c | 4 +-
libgimpbase/gimpbase.def | 3 +
libgimpbase/gimpbaseenums.c | 102 +-
libgimpbase/gimpbaseenums.h | 47 +-
libgimpcolor/gimpcolor.def | 3 +
libgimpcolor/gimpcolorprofile.c | 244 +-
libgimpcolor/gimpcolorprofile.h | 6 +
m4macros/detectcflags.m4 | 2 +-
menus/image-menu.xml.in | 29 +-
plug-ins/Makefile.am | 3 +
plug-ins/common/.gitignore | 2 -
plug-ins/common/Makefile.am | 23 -
plug-ins/common/compose.c | 120 +-
plug-ins/common/decompose.c | 309 +-
plug-ins/common/edge-neon.c | 10 +-
plug-ins/common/file-png.c | 228 +-
plug-ins/common/file-tiff-load.c | 421 ++-
plug-ins/common/file-xmc.c | 100 +-
plug-ins/common/file-xwd.c | 534 ++-
plug-ins/common/gimprc.common | 1 -
plug-ins/common/plugin-defs.pl | 1 -
plug-ins/common/screenshot.c | 1451 ------
plug-ins/common/sharpen.c | 12 +-
plug-ins/common/unsharp-mask.c | 12 +-
plug-ins/pygimp/gimpenumsmodule.c | 3 +
plug-ins/screenshot/.gitignore | 6 +
plug-ins/screenshot/Makefile.am | 56 +
plug-ins/screenshot/screenshot-osx.c | 118 +
plug-ins/screenshot/screenshot-osx.h | 33 +
plug-ins/screenshot/screenshot-x11.c | 702 +++
plug-ins/screenshot/screenshot-x11.h | 33 +
plug-ins/screenshot/screenshot.c | 639 +++
plug-ins/screenshot/screenshot.h | 49 +
plug-ins/script-fu/scheme-wrapper.c | 2 +
.../selection-to-path/selection-to-path-dialog.c | 4 +-
po-libgimp/el.po | 389 +-
po-libgimp/pl.po | 36 +-
po-libgimp/pt.po | 410 +-
po-libgimp/ru.po | 1662 +++++---
po-plug-ins/POTFILES.in | 3 +-
po-plug-ins/el.po | 1496 +++---
po-plug-ins/pl.po | 59 +-
po-plug-ins/pt.po | 1047 ++---
po-python/POTFILES.skip | 1 +
po-script-fu/POTFILES.skip | 1 +
po-script-fu/pl.po | 6 +-
po/de.po | 4994 ++++++++++++--------
po/el.po | 2265 +++++-----
po/it.po | 1197 +++---
po/kk.po | 709 +---
po/pl.po | 285 +-
po/pt.po | 1338 +++---
po/ru.po | 3763 ++++++++-------
tools/pdbgen/enums.pl | 38 +-
tools/pdbgen/pdb/brush.pdb | 84 +-
tools/pdbgen/pdb/context.pdb | 523 ++-
tools/pdbgen/pdb/drawable.pdb | 3 +
tools/pdbgen/pdb/edit.pdb | 14 +-
tools/pdbgen/pdb/paths.pdb | 2 +-
174 files changed, 18118 insertions(+), 13247 deletions(-)
---
diff --cc plug-ins/Makefile.am
index e588d49,ab304d0..549c27f
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@@ -52,9 -54,9 +54,10 @@@ SUBDIRS =
imagemap \
lighting \
map-object \
+ metainfo \
pagecurl \
$(print) \
+ $(screenshot) \
selection-to-path \
$(twain) \
ui \
diff --cc plug-ins/common/file-tiff-load.c
index 447bdc2,9a0bff1..af539ed
--- a/plug-ins/common/file-tiff-load.c
+++ b/plug-ins/common/file-tiff-load.c
@@@ -86,57 -86,58 +86,59 @@@ typedef struc
/* Declare some local functions.
*/
- static void query (void);
- static void run (const gchar *name,
- gint nparams,
- const GimpParam *param,
- gint *nreturn_vals,
- GimpParam **return_vals);
+ static void query (void);
+ static void run (const gchar *name,
+ gint nparams,
+ const GimpParam *param,
+ gint *nreturn_vals,
+ GimpParam **return_vals);
- static gboolean load_dialog (TIFF *tif,
- TiffSelectedPages *pages);
+ static gboolean load_dialog (TIFF *tif,
+ TiffSelectedPages *pages);
-static gint32 load_image (const gchar *filename,
- TIFF *tif,
- TiffSelectedPages *pages,
- gboolean *resolution_loaded,
- GError **error);
+static gint32 load_image (const gchar *filename,
+ gint32 *layer_ID,
+ TIFF *tif,
+ TiffSelectedPages *pages,
+ gboolean *resolution_loaded,
+ GError **error);
- static void load_rgba (TIFF *tif,
- ChannelData *channel);
- static void load_contiguous (TIFF *tif,
- ChannelData *channel,
- const Babl *type,
- gushort bps,
- gushort spp,
- gboolean is_bw,
- gint extra);
- static void load_separate (TIFF *tif,
- ChannelData *channel,
- const Babl *type,
- gushort bps,
- gushort spp,
- gboolean is_bw,
- gint extra);
- static void load_paths (TIFF *tif,
- gint image);
-
- static void tiff_warning (const gchar *module,
- const gchar *fmt,
- va_list ap) G_GNUC_PRINTF (2, 0);
- static void tiff_error (const gchar *module,
- const gchar *fmt,
- va_list ap) G_GNUC_PRINTF (2, 0);
- static TIFF * tiff_open (const gchar *filename,
- const gchar *mode,
- GError **error);
-
- static void fill_bit2byte (void);
- static void convert_bit2byte (const guchar *src,
- guchar *dest,
- gint width,
- gint height);
+ static GimpColorProfile * load_profile (TIFF *tif);
+
+ static void load_rgba (TIFF *tif,
+ ChannelData *channel);
+ static void load_contiguous (TIFF *tif,
+ ChannelData *channel,
+ const Babl *type,
+ gushort bps,
+ gushort spp,
+ gboolean is_bw,
+ gint extra);
+ static void load_separate (TIFF *tif,
+ ChannelData *channel,
+ const Babl *type,
+ gushort bps,
+ gushort spp,
+ gboolean is_bw,
+ gint extra);
+ static void load_paths (TIFF *tif,
+ gint image);
+
+ static void tiff_warning (const gchar *module,
+ const gchar *fmt,
+ va_list ap) G_GNUC_PRINTF (2, 0);
+ static void tiff_error (const gchar *module,
+ const gchar *fmt,
+ va_list ap) G_GNUC_PRINTF (2, 0);
+ static TIFF * tiff_open (const gchar *filename,
+ const gchar *mode,
+ GError **error);
+
+ static void fill_bit2byte (void);
+ static void convert_bit2byte (const guchar *src,
+ guchar *dest,
+ gint width,
+ gint height);
const GimpPlugInInfo PLUG_IN_INFO =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
