[gimp/gimp-attributes-wip: 106/107] 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: 106/107] periodically merge with master to stay up to date
- Date: Sun, 6 Sep 2015 09:33:20 +0000 (UTC)
commit 3294b3e8092d6fe4da2ac0895b965d61d2cec863
Merge: c6e5391 0593eaa
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat Sep 5 18:53:14 2015 +0200
periodically merge with master to stay up to date
Conflicts:
app/xcf/xcf-save.c
configure.ac
libgimp/gimpmetadata.c
plug-ins/Makefile.am
po-plug-ins/POTFILES.in
app/Makefile.am | 40 +-
app/actions/colormap-actions.c | 68 +-
app/actions/colormap-commands.c | 22 +
app/actions/colormap-commands.h | 13 +-
app/actions/file-commands.c | 43 +-
app/actions/filters-actions.c | 6 +
app/actions/image-actions.c | 2 +-
app/actions/layers-commands.c | 2 +-
app/config/Makefile.am | 21 +-
app/config/gimpdisplayconfig.h | 2 +-
app/core/gimp-edit.c | 14 +-
app/core/gimp-gui.c | 20 +
app/core/gimp-gui.h | 20 +-
app/core/gimp-utils.c | 2 +-
app/core/gimpbuffer.c | 59 +-
app/core/gimpbuffer.h | 47 +-
app/core/gimpchannel-select.c | 40 +
app/core/gimpchannel-select.h | 7 +
app/core/gimpchannel.c | 12 +-
app/core/gimpdrawable-blend.c | 4 +
app/core/gimpdrawable-transform.c | 2 +-
app/core/gimpdrawable.c | 15 +-
app/core/gimpdrawable.h | 2 +
app/core/gimpgrouplayer.c | 14 +-
app/core/gimpgrouplayerundo.c | 2 +-
app/core/gimpimage-color-profile.c | 204 +-
app/core/gimpimage-color-profile.h | 24 +-
app/core/gimpimage-convert-precision.c | 1 +
app/core/gimpimage-convert-type.c | 2 +-
app/core/gimpimage-duplicate.c | 19 +-
app/core/gimpimage-new.c | 25 +-
app/core/gimpimage-pick-color.c | 6 +-
app/core/gimpimage-pick-color.h | 4 +-
app/core/gimpimage-private.h | 1 +
app/core/gimpimage.c | 66 +-
app/core/gimpimageundo.c | 3 +-
app/core/gimpitem.c | 11 +-
app/core/gimpitem.h | 3 +-
app/core/gimpitemstack.c | 29 +-
app/core/gimpitemstack.h | 1 +
app/core/gimplayer-new.c | 109 +-
app/core/gimplayer-new.h | 3 +-
app/core/gimplayer.c | 226 +-
app/core/gimplayermask.c | 3 +
app/core/gimpmarshal.list | 2 +-
app/core/gimpobject.c | 9 +
app/core/gimppickable.c | 57 +-
app/core/gimppickable.h | 4 +-
app/core/gimpselection.c | 5 +-
app/dialogs/Makefile.am | 2 +
app/dialogs/about-dialog.c | 20 +-
app/dialogs/color-profile-dialog.c | 140 +-
app/dialogs/color-profile-import-dialog.c | 151 +
.../color-profile-import-dialog.h} | 21 +-
app/dialogs/file-open-dialog.c | 35 +-
app/dialogs/file-save-dialog.c | 106 +-
app/dialogs/preferences-dialog.c | 2 +-
app/display/gimpcursorview.c | 8 +-
app/display/gimpdisplayshell-callbacks.c | 8 +-
app/display/gimpdisplayshell-handlers.c | 21 -
app/display/gimpdisplayshell-profile.c | 23 +-
app/display/gimpdisplayshell-title.c | 21 +-
app/display/gimpdisplayshell.c | 3 +-
app/display/gimpimagewindow.c | 2 +
app/file/file-open.c | 85 +-
app/gegl/Makefile.am | 1 +
app/gegl/gimp-gegl-loops.c | 171 +
app/gegl/gimp-gegl-loops.h | 123 +-
app/gui/gui-vtable.c | 24 +-
app/main.c | 11 +
app/operations/gimpoperationblend.c | 4 +
app/operations/tests/Makefile.am | 1 -
app/pdb/image-cmds.c | 4 +-
app/pdb/image-color-profile-cmds.c | 18 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/layer-cmds.c | 12 +-
app/pdb/plug-in-compat-cmds.c | 362 +-
app/plug-in/Makefile.am | 5 +-
app/plug-in/plug-in-icc-profile.c | 138 -
app/sanity.c | 1 +
app/tests/Makefile.am | 20 +-
app/text/gimptextlayer.c | 3 +
app/text/gimptextundo.c | 3 +-
app/tools/gimpcolorpickertool.c | 31 +-
app/tools/gimpcolortool.c | 35 +-
app/tools/gimpcolortool.h | 8 +-
app/tools/gimpcurvestool.c | 8 +-
app/tools/gimpgegltool.c | 1 +
app/tools/gimpimagemaptool.c | 18 +-
app/tools/gimplevelstool.c | 59 +-
app/vectors/gimpvectors.c | 8 +-
app/widgets/Makefile.am | 6 +
app/widgets/gimpchanneltreeview.c | 3 +-
app/widgets/gimpcolorframe.c | 56 +-
app/widgets/gimpcolorframe.h | 8 +-
app/widgets/gimpcolormapeditor.c | 17 +
app/widgets/gimpexportdialog.c | 258 +
app/widgets/gimpexportdialog.h | 59 +
app/widgets/gimpfiledialog.c | 927 +--
app/widgets/gimpfiledialog.h | 71 +-
app/widgets/gimphelp-ids.h | 5 +
app/widgets/gimpimageprofileview.c | 2 -
app/widgets/gimpopendialog.c | 104 +
app/widgets/gimpopendialog.h | 59 +
app/widgets/gimpsamplepointeditor.c | 10 +-
app/widgets/gimpsavedialog.c | 446 +
app/widgets/gimpsavedialog.h | 69 +
app/widgets/gimpselectioneditor.c | 2 +-
app/widgets/gimpthumbbox.c | 16 +
app/widgets/gimpviewrenderer.c | 166 +-
app/widgets/gimpviewrenderer.h | 7 +
app/widgets/gimpviewrendererbrush.c | 7 +-
app/widgets/gimpviewrendererbrush.h | 3 +
app/widgets/gimpviewrendererbuffer.c | 2 +-
app/widgets/gimpviewrendererdrawable.c | 2 +-
app/widgets/gimpviewrendererimage.c | 2 +-
app/widgets/gimpviewrendererimagefile.c | 2 +-
app/widgets/gimpwidgets-constructors.c | 19 +
app/widgets/gimpwidgets-constructors.h | 10 +-
app/widgets/widgets-enums.h | 7 -
app/widgets/widgets-types.h | 7 +-
app/xcf/xcf-load.c | 11 +
app/xcf/xcf-save.c | 21 +
build/windows/gimp.manifest | 1 +
build/windows/jhbuild/build.jhbuildrc | 5 +-
build/windows/jhbuild/gdb.moduleset | 6 +-
build/windows/jhbuild/gtk+.moduleset | 6 +-
build/windows/jhbuild/mkarchive | 6 +-
configure.ac | 6 +-
devel-docs/app/app-sections.txt | 1 -
libgimp/gimp.c | 11 +
libgimp/gimpimagecolorprofile_pdb.c | 5 +-
libgimp/gimpmetadata.c | 33 +-
libgimpbase/gimpmetadata.h | 1 +
libgimpcolor/gimpcolor.def | 1 +
libgimpcolor/gimpcolormanaged.c | 3 +-
libgimpcolor/gimpcolorprofile.c | 110 +-
libgimpcolor/gimpcolorprofile.h | 2 +
libgimpconfig/gimpcolorconfig.c | 38 +-
libgimpwidgets/gimpcolorprofilechooserdialog.c | 13 +-
libgimpwidgets/gimpcolorprofileview.c | 58 +-
libgimpwidgets/gimpruler.c | 176 +-
libgimpwidgets/gimpwidgetsutils.c | 7 +-
libgimpwidgets/gimpwidgetsutils.h | 2 +-
menus/colormap-menu.xml | 5 +
menus/image-menu.xml.in | 1 +
modules/color-selector-cmyk.c | 7 +-
modules/display-filter-lcms.c | 25 +-
plug-ins/Makefile.am | 1 -
plug-ins/common/.gitignore | 2 -
plug-ins/common/Makefile.am | 19 -
plug-ins/common/file-gif-save.c | 69 +-
plug-ins/common/file-jp2-load.c | 54 +-
plug-ins/common/file-png.c | 72 +-
plug-ins/common/file-tiff-load.c | 24 +-
plug-ins/common/file-tiff-save.c | 107 +-
plug-ins/common/gimprc.common | 1 -
plug-ins/common/lcms.c | 481 --
plug-ins/common/plugin-defs.pl | 1 -
plug-ins/file-jpeg/jpeg-load.c | 38 +-
plug-ins/file-jpeg/jpeg-save.c | 41 +-
plug-ins/file-psd/psd-image-res-load.c | 19 +-
plug-ins/file-psd/psd-layer-res-load.c | 35 +
plug-ins/file-psd/psd-save.c | 31 +-
plug-ins/file-psd/psd.h | 9 +-
plug-ins/maze/.gitignore | 7 -
plug-ins/maze/Makefile.am | 53 -
plug-ins/maze/maze-algorithms.c | 646 --
plug-ins/maze/maze-algorithms.h | 41 -
plug-ins/maze/maze-dialog.c | 709 --
plug-ins/maze/maze-dialog.h | 24 -
plug-ins/maze/maze-utils.c | 155 -
plug-ins/maze/maze-utils.h | 31 -
plug-ins/maze/maze.c | 751 --
plug-ins/maze/maze.h | 68 -
plug-ins/pygimp/gimpfu.py | 1 +
plug-ins/script-fu/script-fu-scripts.c | 10 +-
plug-ins/script-fu/scripts/palette-export.scm | 35 +-
po-libgimp/POTFILES.in | 1 +
po-libgimp/pl.po | 189 +-
po-libgimp/pt.po | 152 +-
po-plug-ins/POTFILES.in | 5 -
po-plug-ins/pl.po | 948 ++--
po-plug-ins/pt.po | 7712 ++++++++----------
po-plug-ins/tr.po | 8489 ++++++++++----------
po-python/pl.po | 52 +-
po-script-fu/pl.po | 2451 ++++---
po-tags/pl.po | 11 +-
po-tips/pl.po | 86 +-
po/POTFILES.in | 5 +-
po/el.po | 1061 ++--
po/pl.po | 764 +-
po/pt.po | 1996 +++---
po/tr.po | 4454 ++++++-----
tools/pdbgen/pdb/image.pdb | 4 +-
tools/pdbgen/pdb/image_color_profile.pdb | 21 +-
tools/pdbgen/pdb/layer.pdb | 13 +-
tools/pdbgen/pdb/plug_in_compat.pdb | 220 +-
198 files changed, 19054 insertions(+), 19043 deletions(-)
---
diff --cc app/xcf/xcf-save.c
index 2cc0110,514dc13..ea40dab
--- a/app/xcf/xcf-save.c
+++ b/app/xcf/xcf-save.c
@@@ -338,11 -337,11 +338,12 @@@ xcf_save_image_props (XcfInfo *info
GimpImage *image,
GError **error)
{
- GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
- GimpParasite *grid_parasite = NULL;
- GimpParasite *meta_parasite = NULL;
- GimpParasite *compat_parasite = NULL;
- GimpUnit unit = gimp_image_get_unit (image);
+ GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
+ GimpParasite *grid_parasite = NULL;
+ GimpParasite *meta_parasite = NULL;
+ GimpParasite *attributes_parasite = NULL;
++ GimpParasite *compat_parasite = NULL;
+ GimpUnit unit = gimp_image_get_unit (image);
gdouble xres;
gdouble yres;
diff --cc configure.ac
index 312edb8,e2335c6..a8d90e7
--- a/configure.ac
+++ b/configure.ac
@@@ -2307,8 -2312,6 +2312,7 @@@ plug-ins/imagemap/images/Makefil
plug-ins/lighting/Makefile
plug-ins/lighting/images/Makefile
plug-ins/map-object/Makefile
- plug-ins/maze/Makefile
+plug-ins/metainfo/Makefile
plug-ins/pagecurl/Makefile
plug-ins/print/Makefile
plug-ins/pygimp/Makefile
diff --cc libgimp/gimpmetadata.c
index b022b1c,402d83c..e5d6e12
--- a/libgimp/gimpmetadata.c
+++ b/libgimp/gimpmetadata.c
@@@ -134,66 -131,77 +134,97 @@@ gimp_image_metadata_load_finish (gint3
g_return_if_fail (mime_type != NULL);
g_return_if_fail (GEXIV2_IS_METADATA (metadata));
- if (flags & GIMP_METADATA_LOAD_COMMENT)
+ if (flags & GIMP_METADATA_LOAD_ORIENTATION)
{
- gchar *comment;
+ gimp_image_metadata_rotate_query (image_ID, mime_type,
+ metadata, interactive);
+ }
- comment = gexiv2_metadata_get_tag_interpreted_string (metadata,
- "Exif.Photo.UserComment");
- if (! comment)
- comment = gexiv2_metadata_get_tag_interpreted_string (metadata,
- "Exif.Image.ImageDescription");
+ attributes = gimp_attributes_from_metadata (attributes, metadata);
- if (comment)
+ if (attributes)
+ {
+ if (flags & GIMP_METADATA_LOAD_COMMENT)
{
- GimpParasite *parasite;
+ GimpAttribute *attribute = NULL;
+ gchar *comment = NULL;
- parasite = gimp_parasite_new ("gimp-comment",
- GIMP_PARASITE_PERSISTENT,
- strlen (comment) + 1,
- comment);
- g_free (comment);
+ attribute = gimp_attributes_get_attribute (attributes, "Exif.Photo.UserComment");
+ if (attribute)
+ comment = gimp_attribute_get_string (attribute);
+ else
+ {
+ attribute = gimp_attributes_get_attribute (attributes, "Exif.Image.ImageDescription");
+ if (attribute)
+ comment = gimp_attribute_get_string (attribute);
+ }
+
+ if (comment)
+ {
+ GimpParasite *parasite;
+
+ parasite = gimp_parasite_new ("gimp-comment",
+ GIMP_PARASITE_PERSISTENT,
+ strlen (comment) + 1,
+ comment);
+ g_free (comment);
- gimp_image_attach_parasite (image_ID, parasite);
- gimp_parasite_free (parasite);
+ gimp_image_attach_parasite (image_ID, parasite);
+ gimp_parasite_free (parasite);
+ }
}
- }
+ if (flags & GIMP_METADATA_LOAD_RESOLUTION)
+ {
+ gdouble xres;
+ gdouble yres;
+ GimpUnit unit;
- if (flags & GIMP_METADATA_LOAD_RESOLUTION)
- {
- gdouble xres;
- gdouble yres;
- GimpUnit unit;
+ if (gimp_attributes_get_resolution (attributes, &xres, &yres, &unit))
+ {
+ gimp_image_set_resolution (image_ID, xres, yres);
+ gimp_image_set_unit (image_ID, unit);
+ }
+ }
- if (gimp_metadata_get_resolution (metadata, &xres, &yres, &unit))
+ gimp_image_set_attributes (image_ID, attributes);
+ if (layer_ID > 0)
{
- gimp_image_set_resolution (image_ID, xres, yres);
- gimp_image_set_unit (image_ID, unit);
+ gimp_item_set_attributes (layer_ID, attributes);
}
- g_object_unref (attributes);
- }
- if (flags & GIMP_METADATA_LOAD_ORIENTATION)
- {
- gimp_image_metadata_rotate_query (image_ID, mime_type,
- metadata, interactive);
}
+
+ if (flags & GIMP_METADATA_LOAD_COLORSPACE)
+ {
+ gchar *value;
++ GimpAttribute *attribute = NULL;
+
++ attribute = gimp_attributes_get_attribute (attributes, "Exif.Iop.InteroperabilityIndex");
++ if (attribute)
++ value = gimp_attribute_get_string (attribute);
+ value = gexiv2_metadata_get_tag_interpreted_string (metadata,
+ "Exif.Iop.InteroperabilityIndex");
+
+ if (! g_strcmp0 (value, "R03"))
+ {
+ GimpColorProfile *profile = gimp_image_get_color_profile (image_ID);
+
+ if (! profile)
+ {
+ /* honor the R03 InteroperabilityIndex only if the
+ * image didn't contain an ICC profile
+ */
+ profile = gimp_color_profile_new_adobe_rgb ();
+ gimp_image_set_color_profile (image_ID, profile);
+ }
+
+ g_object_unref (profile);
+ }
+
+ g_free (value);
+ }
+
- gimp_image_set_metadata (image_ID, metadata);
++ g_object_unref (attributes);
}
/**
diff --cc plug-ins/Makefile.am
index d0a101a,cc017bd..e588d49
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@@ -52,8 -52,6 +52,7 @@@ SUBDIRS =
imagemap \
lighting \
map-object \
- maze \
+ metainfo \
pagecurl \
$(print) \
selection-to-path \
diff --cc plug-ins/common/Makefile.am
index 4d7a644,1b98f1a..ebb9ed8
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@@ -115,11 -114,10 +115,10 @@@ libexec_PROGRAMS =
grid \
guillotine \
hot \
+ iptc \
jigsaw \
- lcms \
$(MAIL) \
max-rgb \
- metadata \
newsprint \
nl-filter \
oilify \
@@@ -1468,30 -1445,12 +1467,12 @@@ jigsaw_LDADD =
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
- $(mail_RC)
+ $(jigsaw_RC)
- lcms_SOURCES = \
- lcms.c
-
- lcms_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(GEGL_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS) \
- $(lcms_RC)
-
-max_rgb_SOURCES = \
- max-rgb.c
+mail_SOURCES = \
+ mail.c
-max_rgb_LDADD = \
+mail_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
diff --cc plug-ins/common/file-jp2-load.c
index e68e5b9,0facb3c..2803617
--- a/plug-ins/common/file-jp2-load.c
+++ b/plug-ins/common/file-jp2-load.c
@@@ -57,10 -57,10 +57,11 @@@ static void run (cons
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (const gchar *filename,
+ gint32 *layer_ID,
GError **error);
- static void load_icc_profile (jas_image_t *jas_image,
- gint image_ID);
+ static gboolean load_icc_profile (jas_image_t *jas_image,
+ gint image_ID,
+ GError **error);
const GimpPlugInInfo PLUG_IN_INFO =
diff --cc plug-ins/common/gimprc.common
index daae82a,c8fdbbf..c68d31b
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@@ -69,11 -68,10 +69,10 @@@ gradient_map_RC = gradient-map.rc.
grid_RC = grid.rc.o
guillotine_RC = guillotine.rc.o
hot_RC = hot.rc.o
+iptc_RC = iptc.rc.o
jigsaw_RC = jigsaw.rc.o
- lcms_RC = lcms.rc.o
mail_RC = mail.rc.o
max_rgb_RC = max-rgb.rc.o
-metadata_RC = metadata.rc.o
newsprint_RC = newsprint.rc.o
nl_filter_RC = nl-filter.rc.o
oilify_RC = oilify.rc.o
diff --cc plug-ins/common/plugin-defs.pl
index c6f81af,233b1ae..a6aa6e9
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@@ -70,11 -69,10 +70,10 @@@
'grid' => { ui => 1 },
'guillotine' => {},
'hot' => { ui => 1 },
+ 'iptc' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'jigsaw' => { ui => 1 },
- '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 },
diff --cc po-plug-ins/POTFILES.in
index 21cb48d,561f452..fb4f550
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@@ -75,9 -74,9 +75,8 @@@ plug-ins/common/grid.
plug-ins/common/guillotine.c
plug-ins/common/hot.c
plug-ins/common/jigsaw.c
- plug-ins/common/lcms.c
plug-ins/common/mail.c
plug-ins/common/max-rgb.c
-plug-ins/common/metadata.c
plug-ins/common/newsprint.c
plug-ins/common/nl-filter.c
plug-ins/common/oilify.c
@@@ -213,15 -211,6 +212,11 @@@ plug-ins/lighting/lighting-ui.
plug-ins/map-object/map-object-apply.c
plug-ins/map-object/map-object-main.c
plug-ins/map-object/map-object-ui.c
- plug-ins/maze/maze-algorithms.c
- plug-ins/maze/maze-dialog.c
- plug-ins/maze/maze.c
- plug-ins/maze/maze.h
+plug-ins/metainfo/interface.c
+plug-ins/metainfo/page-administration.c
+plug-ins/metainfo/page-rights.c
+plug-ins/metainfo/page-description.c
+plug-ins/metainfo/page-artwork.c
plug-ins/pagecurl/pagecurl.c
plug-ins/print/print-draw-page.c
plug-ins/print/print-page-layout.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
