[gimp/gimp-attributes-wip: 189/190] 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: 189/190] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Fri, 27 May 2016 16:29:31 +0000 (UTC)
commit 55abb621595678c8e13bb34acbb6607f74bb7fcb
Merge: 0303bd2 0d8b8c2
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Fri May 27 08:28:02 2016 +0200
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
Conflicts:
app/core/core-enums.c
app/core/core-enums.h
app/core/core-types.h
app/core/gimpimage-merge.c
app/core/gimpimage-undo-push.c
app/core/gimpimage-undo-push.h
app/core/gimpimageundo.c
app/core/gimpimageundo.h
app/xcf/xcf-load.c
configure.ac
plug-ins/file-tiff/file-tiff.c
app/Makefile.am | 1 -
app/actions/dialogs-actions.c | 2 +-
app/actions/gimpgeglprocedure.c | 2 +-
app/actions/image-actions.c | 64 +-
app/actions/image-commands.c | 154 +-
app/actions/image-commands.h | 99 +-
app/actions/layers-actions.c | 2 +-
app/actions/layers-commands.c | 14 +-
app/actions/select-actions.c | 2 +-
app/actions/select-commands.c | 42 +-
app/actions/tools-commands.c | 2 +-
app/actions/view-actions.c | 212 +
app/actions/view-commands.c | 331 +-
app/actions/view-commands.h | 175 +-
app/config/Makefile.am | 1 -
app/config/gimpguiconfig.c | 22 +-
app/config/gimpguiconfig.h | 2 +-
app/config/gimprc-blurbs.h | 4 +-
app/core/Makefile.am | 21 +-
app/core/core-enums.c | 47 +-
app/core/core-enums.h | 23 +-
app/core/core-types.h | 38 +-
app/core/gimp-edit.c | 8 +-
app/core/gimp-edit.h | 84 +-
app/core/gimp-templates.c | 4 +-
app/core/gimpbrush.c | 14 +-
app/core/gimpbrush.h | 14 +-
app/core/gimpbrushgenerated.c | 12 +-
app/core/gimpbrushgenerated.h | 12 +-
app/core/gimpbuffer.c | 10 +-
app/core/gimpbuffer.h | 10 +-
app/core/gimpchannel.c | 70 +-
app/core/gimpchannel.h | 182 +-
app/core/gimpchannelpropundo.h | 1 +
app/core/gimpchannelundo.h | 1 +
app/core/gimpcontainer-filter.c | 18 +-
app/core/gimpcontainer-filter.h | 6 +-
app/core/gimpcontainer.c | 42 +-
app/core/gimpcontainer.h | 138 +-
app/core/gimpcontext.c | 2 +-
app/core/gimpcontext.h | 2 +-
app/core/gimpdrawable-blend.c | 8 +-
app/core/gimpdrawable-combine.c | 3 +-
...impdrawable-filter.c => gimpdrawable-filters.c} | 4 +-
...impdrawable-filter.h => gimpdrawable-filters.h} | 8 +-
app/core/gimpdrawable-floating-selection.c | 391 +
app/core/gimpdrawable-floating-selection.h | 31 +
app/core/gimpdrawable-preview.c | 26 +-
app/core/gimpdrawable-transform.c | 105 +-
app/core/gimpdrawable-transform.h | 4 +
app/core/gimpdrawable.c | 433 +-
app/core/gimpdrawable.h | 58 +-
app/core/gimpdrawablefilter.c | 790 +
app/core/gimpdrawablefilter.h | 81 +
app/core/gimpdrawablemodundo.h | 1 +
app/core/gimpdrawableundo.h | 1 +
app/core/gimpfilterstack.c | 20 +-
...oatingselundo.c => gimpfloatingselectionundo.c} | 49 +-
app/core/gimpfloatingselectionundo.h | 52 +
app/core/gimpfloatingselundo.h | 51 -
app/core/gimpgrid.c | 2 +-
app/core/gimpgrid.h | 2 +-
app/core/gimpgrouplayer.c | 14 +-
app/core/gimpgrouplayerundo.h | 1 +
app/core/gimpguideundo.h | 1 +
app/core/gimpimage-color-profile.c | 464 +-
app/core/gimpimage-color-profile.h | 34 +-
app/core/gimpimage-colormap.c | 8 +-
app/core/gimpimage-colormap.h | 56 +-
app/core/gimpimage-convert-precision.c | 61 +-
app/core/gimpimage-duplicate.c | 2 +-
app/core/gimpimage-item-list.c | 2 +-
app/core/gimpimage-item-list.h | 2 +-
app/core/gimpimage-merge.c | 5 +-
app/core/gimpimage-new.c | 41 +-
app/core/gimpimage-pick-layer.c | 18 +-
app/core/gimpimage-pick-layer.h | 18 +-
app/core/gimpimage-preview.c | 26 +-
app/core/gimpimage-private.h | 14 +-
app/core/gimpimage-quick-mask.c | 12 +-
app/core/gimpimage-quick-mask.h | 20 +-
app/core/gimpimage-scale.c | 10 +-
app/core/gimpimage-scale.h | 2 +-
app/core/gimpimage-undo-push.c | 16 +-
app/core/gimpimage-undo-push.h | 2 +
app/core/gimpimage-undo.c | 8 +-
app/core/gimpimage-undo.h | 64 +-
app/core/gimpimage.c | 206 +-
app/core/gimpimage.h | 144 +-
app/core/gimpimagemap.c | 776 -
app/core/gimpimagemap.h | 79 -
app/core/gimpimageundo.c | 16 +
app/core/gimpimageundo.h | 3 +
app/core/gimpitem-linked.c | 2 +-
app/core/gimpitem-linked.h | 2 +-
app/core/gimpitem.c | 62 +-
app/core/gimpitem.h | 48 +-
app/core/gimpitempropundo.h | 1 +
app/core/gimpitemundo.h | 1 +
...oating-sel.c => gimplayer-floating-selection.c} | 5 +-
...oating-sel.h => gimplayer-floating-selection.h} | 6 +-
app/core/gimplayer-new.c | 31 +-
app/core/gimplayer.c | 100 +-
app/core/gimplayer.h | 22 +-
app/core/gimplayermask.c | 14 +-
app/core/gimplayermask.h | 26 +-
app/core/gimplayermaskpropundo.h | 1 +
app/core/gimplayermaskundo.h | 1 +
app/core/gimplayerpropundo.h | 1 +
app/core/gimplayerundo.h | 1 +
app/core/gimplist.c | 96 +-
app/core/gimpmaskundo.h | 1 +
app/core/gimpparasitelist.c | 2 +-
app/core/gimpparasitelist.h | 2 +-
app/core/gimppattern.c | 4 +-
app/core/gimppattern.h | 10 +-
app/core/gimppickable.c | 77 +-
app/core/gimppickable.h | 93 +-
app/core/gimpprojection.c | 37 +
app/core/gimpsamplepointundo.h | 1 +
app/core/gimpselection.c | 42 +-
app/core/gimptag.c | 4 +-
app/core/gimptag.h | 46 +-
app/core/gimptemplate.c | 61 +
app/core/gimptemplate.h | 3 +
app/core/gimptoolinfo.c | 4 +-
app/dialogs/Makefile.am | 1 -
app/dialogs/action-search-dialog.c | 2 +-
app/dialogs/color-profile-dialog.c | 102 +-
app/dialogs/convert-indexed-dialog.c | 24 +-
app/dialogs/layer-options-dialog.c | 2 +-
app/dialogs/preferences-dialog.c | 351 +-
app/display/Makefile.am | 2 +
app/display/gimpcanvaslayerboundary.c | 2 +-
app/display/gimpdisplayshell-actions.c | 149 +
app/display/gimpdisplayshell-actions.h | 33 +
app/display/gimpdisplayshell-appearance.c | 108 +-
app/display/gimpdisplayshell-filter-dialog.c | 10 +-
app/display/gimpdisplayshell-filter.c | 7 +-
app/display/gimpdisplayshell-filter.h | 3 +-
app/display/gimpdisplayshell-handlers.c | 130 +-
app/display/gimpdisplayshell-layer-select.c | 33 +-
app/display/gimpdisplayshell-profile.c | 203 +-
app/display/gimpdisplayshell-profile.h | 4 +-
app/display/gimpdisplayshell-render.c | 6 +-
app/display/gimpdisplayshell-title.c | 18 +-
app/display/gimpdisplayshell-transform.c | 218 +-
app/display/gimpdisplayshell-transform.h | 274 +-
app/display/gimpdisplayshell.c | 17 +-
app/display/gimpdisplayshell.h | 15 +-
app/display/gimpimagewindow.c | 3 +
app/display/gimpnavigationeditor.c | 2 +
app/display/gimpstatusbar.c | 300 +-
app/file/file-open.c | 8 +-
app/gegl/Makefile.am | 1 -
app/gegl/gimp-gegl-apply-operation.c | 93 +-
app/gegl/gimp-gegl-apply-operation.h | 214 +-
app/gegl/gimp-gegl-loops.c | 155 +-
app/gegl/gimp-gegl-loops.h | 10 -
app/gegl/gimp-gegl-utils.c | 52 +-
app/gegl/gimpapplicator.c | 38 +-
app/gegl/gimpapplicator.h | 5 +-
app/operations/Makefile.am | 4 +
app/operations/gimp-operations.c | 4 +
app/operations/gimpoperationbehindmode.c | 21 +-
app/operations/gimpoperationcagetransform.c | 32 +-
app/operations/gimpoperationcomposecrop.c | 255 +
app/operations/gimpoperationcomposecrop.h | 55 +
app/operations/gimpoperationprofiletransform.c | 297 +
app/operations/gimpoperationprofiletransform.h | 65 +
app/operations/gimpoperationshapeburst.c | 30 +-
app/paint/gimpinkundo.h | 1 +
app/paint/gimppaintcore.c | 4 +-
app/paint/gimppaintcoreundo.h | 1 +
app/paint/paint-types.h | 6 -
app/pdb/floating-sel-cmds.c | 2 +-
app/pdb/selection-cmds.c | 6 +-
app/plug-in/gimppluginprocedure.c | 10 +-
app/plug-in/gimppluginprocedure.h | 82 +-
app/plug-in/gimptemporaryprocedure.c | 4 +-
app/tests.c | 8 +-
app/tests/Makefile.am | 1 -
app/text/gimptext-compat.c | 2 +-
app/tools/Makefile.am | 12 +-
app/tools/gimp-tools.c | 2 +-
app/tools/gimpblendtool.c | 99 +-
app/tools/gimpblendtool.h | 2 +-
app/tools/gimpbrightnesscontrasttool.c | 78 +-
app/tools/gimpbrightnesscontrasttool.h | 14 +-
app/tools/gimpcagetool.c | 74 +-
app/tools/gimpcagetool.h | 2 +-
app/tools/gimpcolorbalancetool.c | 92 +-
app/tools/gimpcolorbalancetool.h | 6 +-
app/tools/gimpcolorizetool.c | 104 +-
app/tools/gimpcolorizetool.h | 6 +-
app/tools/gimpcoloroptions.c | 10 +-
app/tools/gimpcoloroptions.h | 17 +-
app/tools/gimpcurvestool.c | 278 +-
app/tools/gimpcurvestool.h | 6 +-
.../{gimpimagemapoptions.c => gimpfilteroptions.c} | 81 +-
app/tools/gimpfilteroptions.h | 58 +
...aptool-settings.c => gimpfiltertool-settings.c} | 134 +-
app/tools/gimpfiltertool-settings.h | 40 +
app/tools/gimpfiltertool.c | 1462 ++
app/tools/{gimpimagemaptool.h => gimpfiltertool.h} | 69 +-
app/tools/gimpfliptool.c | 3 +
app/tools/gimpforegroundselecttoolundo.h | 1 +
app/tools/gimpfreeselecttool.c | 2 +-
app/tools/gimpgegltool.c | 24 +-
app/tools/gimphistogramoptions.c | 35 +-
app/tools/gimphistogramoptions.h | 17 +-
app/tools/gimphuesaturationtool.c | 120 +-
app/tools/gimphuesaturationtool.h | 10 +-
app/tools/gimpimagemapoptions.h | 51 -
app/tools/gimpimagemaptool-settings.h | 40 -
app/tools/gimpimagemaptool.c | 1495 --
app/tools/gimplevelstool.c | 268 +-
app/tools/gimplevelstool.h | 34 +-
app/tools/gimpmovetool.c | 2 +-
app/tools/gimpoperationtool.c | 231 +-
app/tools/gimpoperationtool.h | 24 +-
app/tools/gimprectangleselecttool.c | 6 +-
app/tools/gimpregionselecttool.c | 2 +-
app/tools/gimpseamlessclonetool.c | 68 +-
app/tools/gimpseamlessclonetool.h | 2 +-
app/tools/gimptexttool.c | 2 +-
app/tools/gimpthresholdtool.c | 82 +-
app/tools/gimpthresholdtool.h | 6 +-
app/tools/gimptransformtool.c | 8 +-
app/tools/gimptransformtool.h | 1 +
app/tools/gimptransformtoolundo.h | 1 +
app/tools/gimpwarptool.c | 64 +-
app/tools/gimpwarptool.h | 20 +-
app/tools/tool_manager.c | 20 +-
app/tools/tools-types.h | 6 +-
app/vectors/gimpbezierstroke.c | 58 +-
app/vectors/gimpstroke.c | 228 +-
app/vectors/gimpstroke.h | 88 +-
app/vectors/gimpvectors-export.c | 40 +-
app/vectors/gimpvectors-export.h | 12 +-
app/vectors/gimpvectors-warp.c | 46 +-
app/vectors/gimpvectors-warp.h | 15 +-
app/vectors/gimpvectors.c | 110 +-
app/vectors/gimpvectors.h | 52 +-
app/vectors/gimpvectorsmodundo.h | 1 +
app/vectors/gimpvectorspropundo.h | 1 +
app/vectors/gimpvectorsundo.h | 1 +
app/vectors/vectors-types.h | 13 +-
app/widgets/Makefile.am | 1 -
app/widgets/gimpaction-history.c | 69 +-
app/widgets/gimpcolorhistory.c | 5 +
app/widgets/gimpcolorpanel.c | 5 +
app/widgets/gimpfgbgeditor.c | 134 +-
app/widgets/gimpfgbgeditor.h | 19 +-
app/widgets/gimphelp-ids.h | 5 +-
app/widgets/gimpitemtreeview.h | 28 +-
app/widgets/gimppropwidgets.c | 232 +-
app/widgets/gimppropwidgets.h | 5 +
app/widgets/gimpsessioninfo-book.c | 12 +-
app/widgets/gimpsessioninfo-dock.c | 12 +-
app/widgets/gimpsessioninfo.c | 55 +-
app/widgets/gimpsessioninfo.h | 78 +-
app/widgets/gimptemplateeditor.c | 73 +-
app/widgets/gimpundoeditor.c | 11 +-
app/widgets/gimpviewrenderer.c | 273 +-
app/widgets/gimpviewrenderer.h | 19 +-
app/widgets/gimpviewrenderergradient.c | 2 -
app/widgets/gimpviewrendererpalette.c | 2 -
app/widgets/gimpwidgets-utils.c | 94 +-
app/widgets/gimpwidgets-utils.h | 10 +-
app/xcf/xcf-load.c | 2 +-
configure.ac | 6 +-
icons/Color/16/gimp-colormap.png | Bin 677 -> 379 bytes
icons/Color/16/gimp-controller-keyboard.png | Bin 1072 -> 586 bytes
icons/Color/16/gimp-controller-midi.png | Bin 457 -> 404 bytes
icons/Color/16/gimp-controller-wheel.png | Bin 873 -> 823 bytes
icons/Color/16/gimp-cursor.png | Bin 582 -> 526 bytes
icons/Color/16/gimp-display-filter.png | Bin 962 -> 904 bytes
icons/Color/16/gimp-duplicate.png | Bin 484 -> 468 bytes
icons/Color/16/gimp-error.png | Bin 0 -> 751 bytes
icons/Color/16/gimp-grid.png | Bin 682 -> 487 bytes
icons/Color/16/gimp-histogram.png | Bin 836 -> 642 bytes
icons/Color/16/gimp-info.png | Bin 907 -> 805 bytes
icons/Color/16/gimp-landscape.png | Bin 743 -> 654 bytes
icons/Color/16/gimp-move-to-screen.png | Bin 872 -> 616 bytes
icons/Color/16/gimp-path-stroke.png | Bin 834 -> 754 bytes
icons/Color/16/gimp-path.png | Bin 642 -> 520 bytes
icons/Color/16/gimp-paths.png | Bin 822 -> 756 bytes
icons/Color/16/gimp-portrait.png | Bin 685 -> 594 bytes
icons/Color/16/gimp-prefs-image-windows.png | Bin 611 -> 671 bytes
icons/Color/16/gimp-prefs-interface.png | Bin 691 -> 657 bytes
icons/Color/16/gimp-prefs-window-management.png | Bin 427 -> 501 bytes
icons/Color/16/gimp-print-resolution.png | Bin 844 -> 358 bytes
icons/Color/16/gimp-question.png | Bin 0 -> 854 bytes
icons/Color/16/gimp-resize.png | Bin 690 -> 650 bytes
icons/Color/16/gimp-sample-point.png | Bin 711 -> 664 bytes
icons/Color/16/gimp-scale.png | Bin 681 -> 602 bytes
icons/Color/16/gimp-selection-stroke.png | Bin 805 -> 737 bytes
icons/Color/16/gimp-selection-to-path.png | Bin 795 -> 733 bytes
icons/Color/16/gimp-template.png | Bin 499 -> 452 bytes
icons/Color/16/gimp-undo-history.png | Bin 838 -> 731 bytes
icons/Color/16/gimp-user-manual.png | Bin 910 -> 899 bytes
icons/Color/16/gimp-video.png | Bin 729 -> 682 bytes
icons/Color/16/gimp-warning.png | Bin 770 -> 782 bytes
icons/Color/16/gimp-web.png | Bin 1012 -> 1047 bytes
icons/Color/22/gimp-path.png | Bin 825 -> 751 bytes
icons/Color/22/gimp-paths.png | Bin 1174 -> 1017 bytes
icons/Color/24/gimp-center.png | Bin 1341 -> 1020 bytes
icons/Color/24/gimp-center.svg | 122 +
icons/Color/24/gimp-channel-alpha.png | Bin 1211 -> 1158 bytes
icons/Color/24/gimp-channel-alpha.svg | 282 +
icons/Color/24/gimp-channel-blue.png | Bin 1103 -> 1056 bytes
icons/Color/24/gimp-channel-blue.svg | 205 +
icons/Color/24/gimp-channel-gray.png | Bin 1086 -> 1022 bytes
icons/Color/24/gimp-channel-gray.svg | 226 +
icons/Color/24/gimp-channel-green.png | Bin 1097 -> 1052 bytes
icons/Color/24/gimp-channel-green.svg | 206 +
icons/Color/24/gimp-channel-indexed.png | Bin 1275 -> 1140 bytes
icons/Color/24/gimp-channel-indexed.svg | 231 +
icons/Color/24/gimp-channel-red.png | Bin 1145 -> 1080 bytes
icons/Color/24/gimp-channel-red.svg | 226 +
icons/Color/24/gimp-channel.png | Bin 1015 -> 991 bytes
icons/Color/24/gimp-channel.svg | 297 +
icons/Color/24/gimp-channels.png | Bin 1153 -> 1133 bytes
icons/Color/24/gimp-channels.svg | 419 +
icons/Color/24/gimp-colormap.png | Bin 933 -> 500 bytes
icons/Color/24/gimp-colormap.svg | 163 +
icons/Color/24/gimp-controller-keyboard.png | Bin 1799 -> 774 bytes
icons/Color/24/gimp-controller-keyboard.svg | 419 +
icons/Color/24/gimp-controller-linux-input.svg | 146 +
icons/Color/24/gimp-controller-midi.png | Bin 523 -> 386 bytes
icons/Color/24/gimp-controller-midi.svg | 141 +
icons/Color/24/gimp-controller-wheel.png | Bin 1275 -> 1197 bytes
icons/Color/24/gimp-controller-wheel.svg | 146 +
icons/Color/24/gimp-controller.svg | 278 +
icons/Color/24/gimp-cursor.png | Bin 726 -> 606 bytes
icons/Color/24/gimp-cursor.svg | 99 +
icons/Color/24/gimp-device-status.png | Bin 1507 -> 1396 bytes
icons/Color/24/gimp-device-status.svg | 181 +
icons/Color/24/gimp-display-filter-colorblind.png | Bin 1018 -> 916 bytes
icons/Color/24/gimp-display-filter-colorblind.svg | 209 +
icons/Color/24/gimp-display-filter-contrast.png | Bin 882 -> 771 bytes
icons/Color/24/gimp-display-filter-contrast.svg | 149 +
icons/Color/24/gimp-display-filter-gamma.png | Bin 1100 -> 940 bytes
icons/Color/24/gimp-display-filter-gamma.svg | 303 +
icons/Color/24/gimp-display-filter-lcms.png | Bin 980 -> 855 bytes
icons/Color/24/gimp-display-filter-lcms.svg | 169 +
icons/Color/24/gimp-display-filter-proof.png | Bin 1150 -> 693 bytes
icons/Color/24/gimp-display-filter-proof.svg | 250 +
icons/Color/24/gimp-display-filter.png | Bin 1480 -> 1490 bytes
icons/Color/24/gimp-display-filter.svg | 165 +
icons/Color/24/gimp-error.png | Bin 0 -> 1105 bytes
icons/Color/24/gimp-error.svg | 140 +
icons/Color/24/gimp-floating-selection.png | Bin 763 -> 746 bytes
icons/Color/24/gimp-floating-selection.svg | 234 +
icons/Color/24/gimp-grid.png | Bin 0 -> 395 bytes
icons/Color/24/gimp-grid.svg | 416 +
icons/Color/24/gimp-image.png | Bin 1188 -> 935 bytes
icons/Color/24/gimp-image.svg | 240 +
icons/Color/24/gimp-images.png | Bin 1095 -> 989 bytes
icons/Color/24/gimp-images.svg | 309 +
icons/Color/24/gimp-info.png | Bin 1438 -> 1402 bytes
icons/Color/24/gimp-info.svg | 623 +
icons/Color/24/gimp-layer-mask.png | Bin 1206 -> 1029 bytes
icons/Color/24/gimp-layer-mask.svg | 231 +
icons/Color/24/gimp-layer.png | Bin 712 -> 687 bytes
icons/Color/24/gimp-layer.svg | 138 +
icons/Color/24/gimp-layers.png | Bin 1066 -> 806 bytes
icons/Color/24/gimp-layers.svg | 172 +
icons/Color/24/gimp-move-to-screen.png | Bin 1368 -> 843 bytes
icons/Color/24/gimp-move-to-screen.svg | 136 +
icons/Color/24/gimp-navigation.png | Bin 0 -> 1005 bytes
icons/Color/24/gimp-navigation.svg | 205 +
icons/Color/24/gimp-print-resolution.png | Bin 1277 -> 464 bytes
icons/Color/24/gimp-print-resolution.svg | 262 +
icons/Color/24/gimp-question.png | Bin 0 -> 1526 bytes
icons/Color/24/gimp-question.svg | 74 +
icons/Color/24/gimp-resize.png | Bin 0 -> 807 bytes
icons/Color/24/gimp-resize.svg | 116 +
icons/Color/24/gimp-sample-point.png | Bin 1036 -> 969 bytes
icons/Color/24/gimp-sample-point.svg | 98 +
icons/Color/24/gimp-scale.png | Bin 0 -> 901 bytes
icons/Color/24/gimp-scale.svg | 116 +
icons/Color/24/gimp-selection.png | Bin 0 -> 264 bytes
icons/Color/24/gimp-selection.svg | 462 +
icons/Color/24/gimp-symmetry.png | Bin 1754 -> 1432 bytes
icons/Color/24/gimp-symmetry.svg | 158 +
icons/Color/24/gimp-template.png | Bin 674 -> 574 bytes
icons/Color/24/gimp-template.svg | 182 +
icons/Color/24/gimp-text-layer.png | Bin 983 -> 828 bytes
icons/Color/24/gimp-text-layer.svg | 143 +
icons/Color/24/gimp-tool-options.png | Bin 991 -> 934 bytes
icons/Color/24/gimp-tool-options.svg | 205 +
icons/Color/24/gimp-tools.png | Bin 1778 -> 1661 bytes
icons/Color/24/gimp-tools.svg | 478 +
icons/Color/24/gimp-transparency.png | Bin 400 -> 308 bytes
icons/Color/24/gimp-transparency.svg | 206 +
icons/Color/24/gimp-undo-history.png | Bin 1365 -> 1066 bytes
icons/Color/24/gimp-undo-history.svg | 82 +
icons/Color/24/gimp-user-manual.png | Bin 1444 -> 1454 bytes
icons/Color/24/gimp-user-manual.svg | 477 +
icons/Color/24/gimp-video.png | Bin 1173 -> 746 bytes
icons/Color/24/gimp-video.svg | 261 +
icons/Color/24/gimp-warning.png | Bin 1208 -> 1043 bytes
icons/Color/24/gimp-warning.svg | 80 +
icons/Color/24/gimp-web.png | Bin 1767 -> 1696 bytes
icons/Color/24/gimp-web.svg | 907 ++
icons/Color/48/gimp-image.png | Bin 2497 -> 2091 bytes
icons/Color/48/gimp-layer-mask.png | Bin 2326 -> 2034 bytes
icons/Color/48/gimp-layer.png | Bin 1157 -> 1095 bytes
icons/Color/48/gimp-text-layer.png | Bin 1715 -> 1428 bytes
icons/Color/64/gimp-error.png | Bin 4176 -> 3285 bytes
icons/Color/64/gimp-question.png | Bin 5226 -> 5120 bytes
icons/Color/64/gimp-warning.png | Bin 3733 -> 3427 bytes
icons/Color/color-scalable.svg |16086 +++++++++++++-------
icons/Color/scalable/gimp-colormap.svg | 103 +-
icons/Color/scalable/gimp-controller-keyboard.svg | 1025 +--
.../Color/scalable/gimp-controller-linux-input.svg | 24 +-
icons/Color/scalable/gimp-controller-midi.svg | 62 +-
icons/Color/scalable/gimp-controller-wheel.svg | 32 +-
icons/Color/scalable/gimp-cursor.svg | 12 +-
icons/Color/scalable/gimp-display-filter.svg | 259 +-
icons/Color/scalable/gimp-duplicate.svg | 60 +-
icons/Color/scalable/gimp-error.svg | 69 +-
icons/Color/scalable/gimp-grid.svg | 865 +-
icons/Color/scalable/gimp-histogram.svg | 16 +-
icons/Color/scalable/gimp-info.svg | 429 +-
icons/Color/scalable/gimp-landscape.svg | 111 +-
icons/Color/scalable/gimp-move-to-screen.svg | 179 +-
icons/Color/scalable/gimp-path-stroke.svg | 179 +-
icons/Color/scalable/gimp-path.svg | 108 +-
icons/Color/scalable/gimp-paths.svg | 163 +-
icons/Color/scalable/gimp-portrait.svg | 64 +-
icons/Color/scalable/gimp-prefs-folders.svg | 297 +-
icons/Color/scalable/gimp-prefs-image-windows.svg | 339 +-
icons/Color/scalable/gimp-prefs-interface.svg | 314 +-
.../scalable/gimp-prefs-window-management.svg | 290 +-
icons/Color/scalable/gimp-print-resolution.svg | 553 +-
icons/Color/scalable/gimp-resize.svg | 76 +-
icons/Color/scalable/gimp-sample-point.svg | 22 +-
icons/Color/scalable/gimp-scale.svg | 82 +-
icons/Color/scalable/gimp-selection-stroke.svg | 163 +-
icons/Color/scalable/gimp-selection-to-path.svg | 460 +-
icons/Color/scalable/gimp-template.svg | 132 +-
icons/Color/scalable/gimp-undo-history.svg | 201 +-
icons/Color/scalable/gimp-user-manual.svg | 346 +-
icons/Color/scalable/gimp-video.svg | 341 +-
icons/Color/scalable/gimp-warning.svg | 55 +-
icons/Color/scalable/gimp-web.svg | 1432 +-
icons/Legacy/24/gimp-grid.png | Bin 0 -> 293 bytes
icons/Legacy/24/gimp-grid.xcf | Bin 0 -> 737 bytes
icons/Legacy/24/gimp-navigation.png | Bin 0 -> 650 bytes
icons/Legacy/24/gimp-resize.png | Bin 0 -> 8517 bytes
icons/Legacy/24/gimp-resize.xcf | Bin 0 -> 1521 bytes
icons/Legacy/24/gimp-scale.png | Bin 0 -> 417 bytes
icons/Legacy/24/gimp-selection.png | Bin 0 -> 278 bytes
icons/Legacy/24/gimp-selection.xcf | Bin 0 -> 779 bytes
icons/Symbolic/16/gimp-channel.png | Bin 275 -> 286 bytes
icons/Symbolic/16/gimp-controller-linux-input.png | Bin 647 -> 623 bytes
icons/Symbolic/16/gimp-error.png | Bin 0 -> 535 bytes
icons/Symbolic/16/gimp-question.png | Bin 0 -> 708 bytes
icons/Symbolic/16/gimp-selection.png | Bin 241 -> 411 bytes
icons/Symbolic/16/gimp-warning.png | Bin 536 -> 501 bytes
icons/Symbolic/24/gimp-center.png | Bin 580 -> 514 bytes
icons/Symbolic/24/gimp-center.svg | 171 +
icons/Symbolic/24/gimp-channel-alpha.png | Bin 746 -> 589 bytes
icons/Symbolic/24/gimp-channel-alpha.svg | 117 +
icons/Symbolic/24/gimp-channel-blue.png | Bin 435 -> 270 bytes
icons/Symbolic/24/gimp-channel-blue.svg | 125 +
icons/Symbolic/24/gimp-channel-gray.png | Bin 430 -> 254 bytes
icons/Symbolic/24/gimp-channel-gray.svg | 111 +
icons/Symbolic/24/gimp-channel-green.png | Bin 448 -> 279 bytes
icons/Symbolic/24/gimp-channel-green.svg | 125 +
icons/Symbolic/24/gimp-channel-indexed.png | Bin 434 -> 276 bytes
icons/Symbolic/24/gimp-channel-indexed.svg | 383 +
icons/Symbolic/24/gimp-channel-red.png | Bin 435 -> 269 bytes
icons/Symbolic/24/gimp-channel-red.svg | 126 +
icons/Symbolic/24/gimp-channel.png | Bin 269 -> 244 bytes
icons/Symbolic/24/gimp-channel.svg | 112 +
icons/Symbolic/24/gimp-channels.png | Bin 523 -> 411 bytes
icons/Symbolic/24/gimp-channels.svg | 126 +
icons/Symbolic/24/gimp-colormap.png | Bin 364 -> 259 bytes
icons/Symbolic/24/gimp-colormap.svg | 191 +
icons/Symbolic/24/gimp-controller-keyboard.png | Bin 757 -> 664 bytes
icons/Symbolic/24/gimp-controller-keyboard.svg | 411 +
icons/Symbolic/24/gimp-controller-linux-input.png | Bin 986 -> 1076 bytes
icons/Symbolic/24/gimp-controller-linux-input.svg | 139 +
icons/Symbolic/24/gimp-controller-midi.svg | 145 +
icons/Symbolic/24/gimp-controller-wheel.png | Bin 532 -> 611 bytes
icons/Symbolic/24/gimp-controller-wheel.svg | 163 +
icons/Symbolic/24/gimp-controller.png | Bin 656 -> 561 bytes
icons/Symbolic/24/gimp-controller.svg | 109 +
icons/Symbolic/24/gimp-cursor.svg | 147 +
icons/Symbolic/24/gimp-device-status.png | Bin 893 -> 868 bytes
icons/Symbolic/24/gimp-device-status.svg | 152 +
.../Symbolic/24/gimp-display-filter-colorblind.png | Bin 686 -> 478 bytes
.../Symbolic/24/gimp-display-filter-colorblind.svg | 181 +
icons/Symbolic/24/gimp-display-filter-contrast.png | Bin 617 -> 399 bytes
icons/Symbolic/24/gimp-display-filter-contrast.svg | 136 +
icons/Symbolic/24/gimp-display-filter-gamma.png | Bin 852 -> 733 bytes
icons/Symbolic/24/gimp-display-filter-gamma.svg | 114 +
icons/Symbolic/24/gimp-display-filter-lcms.png | Bin 1139 -> 1067 bytes
icons/Symbolic/24/gimp-display-filter-lcms.svg | 142 +
icons/Symbolic/24/gimp-display-filter-proof.png | Bin 759 -> 646 bytes
icons/Symbolic/24/gimp-display-filter-proof.svg | 155 +
icons/Symbolic/24/gimp-display-filter.png | Bin 1058 -> 1009 bytes
icons/Symbolic/24/gimp-display-filter.svg | 155 +
icons/Symbolic/24/gimp-error.png | Bin 0 -> 649 bytes
icons/Symbolic/24/gimp-error.svg | 126 +
icons/Symbolic/24/gimp-floating-selection.png | Bin 1158 -> 1185 bytes
icons/Symbolic/24/gimp-floating-selection.svg | 125 +
icons/Symbolic/24/gimp-grid.png | Bin 0 -> 306 bytes
icons/Symbolic/24/gimp-grid.svg | 127 +
icons/Symbolic/24/gimp-image.png | Bin 597 -> 527 bytes
icons/Symbolic/24/gimp-image.svg | 123 +
icons/Symbolic/24/gimp-images.png | Bin 830 -> 521 bytes
icons/Symbolic/24/gimp-images.svg | 149 +
icons/Symbolic/24/gimp-info.png | Bin 740 -> 706 bytes
icons/Symbolic/24/gimp-info.svg | 196 +
icons/Symbolic/24/gimp-layer-mask.png | Bin 804 -> 723 bytes
icons/Symbolic/24/gimp-layer-mask.svg | 142 +
icons/Symbolic/24/gimp-layer.png | Bin 744 -> 698 bytes
icons/Symbolic/24/gimp-layer.svg | 162 +
icons/Symbolic/24/gimp-layers.png | Bin 466 -> 357 bytes
icons/Symbolic/24/gimp-layers.svg | 157 +
icons/Symbolic/24/gimp-move-to-screen.png | Bin 831 -> 785 bytes
icons/Symbolic/24/gimp-move-to-screen.svg | 225 +
icons/Symbolic/24/gimp-navigation.png | Bin 0 -> 379 bytes
icons/Symbolic/24/gimp-navigation.svg | 61 +
icons/Symbolic/24/gimp-print-resolution.png | Bin 530 -> 613 bytes
icons/Symbolic/24/gimp-print-resolution.svg | 166 +
icons/Symbolic/24/gimp-question.png | Bin 0 -> 1079 bytes
icons/Symbolic/24/gimp-question.svg | 145 +
icons/Symbolic/24/gimp-resize.png | Bin 0 -> 769 bytes
icons/Symbolic/24/gimp-resize.svg | 213 +
icons/Symbolic/24/gimp-sample-point.png | Bin 782 -> 844 bytes
icons/Symbolic/24/gimp-sample-point.svg | 247 +
icons/Symbolic/24/gimp-scale.png | Bin 0 -> 678 bytes
icons/Symbolic/24/gimp-scale.svg | 181 +
icons/Symbolic/24/gimp-selection.png | Bin 0 -> 261 bytes
icons/Symbolic/24/gimp-selection.svg | 140 +
icons/Symbolic/24/gimp-symmetry.png | Bin 1044 -> 835 bytes
icons/Symbolic/24/gimp-symmetry.svg | 138 +
icons/Symbolic/24/gimp-template.png | Bin 369 -> 427 bytes
icons/Symbolic/24/gimp-template.svg | 154 +
icons/Symbolic/24/gimp-text-layer.png | Bin 877 -> 746 bytes
icons/Symbolic/24/gimp-text-layer.svg | 135 +
icons/Symbolic/24/gimp-tool-options.png | Bin 555 -> 483 bytes
icons/Symbolic/24/gimp-tool-options.svg | 88 +
icons/Symbolic/24/gimp-tools.png | Bin 1207 -> 1057 bytes
icons/Symbolic/24/gimp-tools.svg | 153 +
icons/Symbolic/24/gimp-transparency.png | Bin 243 -> 234 bytes
icons/Symbolic/24/gimp-transparency.svg | 377 +
icons/Symbolic/24/gimp-undo-history.png | Bin 789 -> 787 bytes
icons/Symbolic/24/gimp-undo-history.svg | 122 +
icons/Symbolic/24/gimp-user-manual.png | Bin 508 -> 463 bytes
icons/Symbolic/24/gimp-user-manual.svg | 159 +
icons/Symbolic/24/gimp-video.png | Bin 523 -> 510 bytes
icons/Symbolic/24/gimp-video.svg | 144 +
icons/Symbolic/24/gimp-warning.png | Bin 721 -> 668 bytes
icons/Symbolic/24/gimp-warning.svg | 94 +
icons/Symbolic/24/gimp-web.png | Bin 1223 -> 1319 bytes
icons/Symbolic/24/gimp-web.svg | 159 +
icons/Symbolic/32/gimp-channel.png | Bin 316 -> 335 bytes
icons/Symbolic/48/gimp-channel-alpha.png | Bin 1388 -> 1169 bytes
icons/Symbolic/48/gimp-channel-blue.png | Bin 551 -> 341 bytes
icons/Symbolic/48/gimp-channel-gray.png | Bin 522 -> 316 bytes
icons/Symbolic/48/gimp-channel-green.png | Bin 554 -> 341 bytes
icons/Symbolic/48/gimp-channel-indexed.png | Bin 556 -> 345 bytes
icons/Symbolic/48/gimp-channel-red.png | Bin 556 -> 343 bytes
icons/Symbolic/48/gimp-channel.png | Bin 385 -> 300 bytes
icons/Symbolic/48/gimp-channels.png | Bin 546 -> 334 bytes
icons/Symbolic/48/gimp-image.png | Bin 954 -> 1080 bytes
icons/Symbolic/48/gimp-layer-mask.png | Bin 1243 -> 1280 bytes
icons/Symbolic/48/gimp-layer.png | Bin 963 -> 1152 bytes
icons/Symbolic/48/gimp-text-layer.png | Bin 1403 -> 1391 bytes
icons/Symbolic/64/gimp-question.png | Bin 2866 -> 2864 bytes
icons/Symbolic/64/gimp-warning.png | Bin 1684 -> 1722 bytes
icons/Symbolic/scalable/gimp-channel.svg | 174 +-
.../scalable/gimp-controller-linux-input.svg | 189 +-
icons/Symbolic/scalable/gimp-question.svg | 225 +-
icons/Symbolic/scalable/gimp-selection.svg | 552 +-
icons/Symbolic/scalable/gimp-warning.svg | 156 +-
icons/Symbolic/symbolic-scalable.svg | 6045 +++++++-
icons/icon-list.mk | 128 +-
libgimpcolor/Makefile.am | 3 +
libgimpcolor/gimpcolor.def | 7 +
libgimpcolor/gimpcolor.h | 1 +
libgimpcolor/gimpcolorprofile.c | 159 +-
libgimpcolor/gimpcolorprofile.h | 4 +
libgimpcolor/gimpcolortransform.c | 473 +
libgimpcolor/gimpcolortransform.h | 115 +
libgimpcolor/gimpcolortypes.h | 8 +-
libgimpconfig/gimpcolorconfig.c | 6 +-
libgimpconfig/gimpconfig-deserialize.c | 56 +-
libgimpconfig/gimpconfig-serialize.c | 27 +-
libgimpwidgets/Makefile.am | 14 +-
libgimpwidgets/gimpcolorarea.c | 182 +-
libgimpwidgets/gimpcolorarea.h | 34 +-
libgimpwidgets/gimpcolorbutton.c | 28 +-
libgimpwidgets/gimpcolorprofilechooserdialog.c | 148 +-
libgimpwidgets/gimpcolorprofilechooserdialog.h | 5 +-
libgimpwidgets/gimpcolorprofilecombobox.c | 3 +-
libgimpwidgets/gimpcolorscale.c | 246 +-
libgimpwidgets/gimpcolorscale.h | 21 +-
libgimpwidgets/gimpcolorscales.c | 20 +
libgimpwidgets/gimpcolorselect.c | 22 +
libgimpwidgets/gimpcolorselection.c | 4 +
libgimpwidgets/gimppreviewarea.c | 225 +-
libgimpwidgets/gimppreviewarea.h | 119 +-
libgimpwidgets/gimpwidgets.def | 3 +
libgimpwidgets/gimpwidgetsutils.c | 70 +-
libgimpwidgets/gimpwidgetsutils.h | 6 +-
menus/image-menu.xml.in | 27 +
modules/Makefile.am | 13 +-
modules/color-selector-cmyk.c | 75 +-
modules/color-selector-wheel.c | 23 +-
modules/display-filter-lcms.c | 52 +-
modules/display-filter-proof.c | 66 +-
modules/gimpcolorwheel.c | 195 +-
modules/gimpcolorwheel.h | 29 +-
plug-ins/common/curve-bend.c | 37 +-
plug-ins/common/file-cel.c | 5 +-
plug-ins/common/film.c | 42 +-
plug-ins/common/smooth-palette.c | 23 +-
plug-ins/file-darktable/Makefile.am | 3 +-
plug-ins/file-darktable/file-darktable.c | 94 +-
plug-ins/file-darktable/file-formats.h | 323 +
plug-ins/file-exr/file-exr.c | 21 +-
plug-ins/file-tiff/file-tiff.c | 3 +-
plug-ins/pygimp/Makefile.am | 5 +-
plug-ins/pygimp/gimp-types.defs | 9 +
plug-ins/pygimp/gimpenums-types.defs | 14 +
plug-ins/pygimp/gimpmodule.c | 1 +
plug-ins/pygimp/gimpui.defs | 15 +
plug-ins/pygimp/gimpui.override | 74 +
plug-ins/pygimp/gimpuimodule.c | 15 +
plug-ins/pygimp/pygimp-drawable.c | 1 +
plug-ins/pygimp/pygimp-tile.c | 2 +
plug-ins/screenshot/Makefile.am | 21 +-
.../{resource.h => screenshot-win32-resource.h} | 0
.../{select.cur => screenshot-win32-select.cur} | Bin 326 -> 326 bytes
.../{small.ico => screenshot-win32-small.ico} | Bin 318 -> 318 bytes
plug-ins/screenshot/screenshot-win32.c | 2 +-
plug-ins/screenshot/screenshot-win32.rc | 6 +-
plug-ins/script-fu/script-fu-regex.c | 9 +
po-libgimp/de.po | 143 +-
po-libgimp/it.po | 187 +-
po-libgimp/pl.po | 52 +-
po-libgimp/ru.po | 220 +-
po-plug-ins/POTFILES.in | 2 +
po-plug-ins/oc.po |10039 ++++++-------
po-plug-ins/pl.po | 249 +-
po-python/ru.po | 333 +-
po/POTFILES.in | 9 +-
po/ca.po | 4030 +++---
po/es.po | 2703 ++--
po/it.po | 2246 ++--
po/oc.po | 5216 +++----
po/pl.po | 1993 ++--
po/ru.po | 5291 ++++---
po/sk.po | 3817 +++--
tools/gimptool.c | 18 +-
tools/pdbgen/pdb/floating_sel.pdb | 2 +-
tools/pdbgen/pdb/selection.pdb | 6 +-
665 files changed, 72182 insertions(+), 37868 deletions(-)
---
diff --cc app/core/core-enums.c
index 18b5f8a,0aaff4b..5a78a68
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@@ -822,8 -822,9 +822,9 @@@ gimp_undo_type_get_type (void
{ GIMP_UNDO_IMAGE_SIZE, "GIMP_UNDO_IMAGE_SIZE", "image-size" },
{ GIMP_UNDO_IMAGE_RESOLUTION, "GIMP_UNDO_IMAGE_RESOLUTION", "image-resolution" },
{ GIMP_UNDO_IMAGE_GRID, "GIMP_UNDO_IMAGE_GRID", "image-grid" },
- { GIMP_UNDO_IMAGE_METADATA, "GIMP_UNDO_IMAGE_METADATA", "image-metadata" },
{ GIMP_UNDO_IMAGE_COLORMAP, "GIMP_UNDO_IMAGE_COLORMAP", "image-colormap" },
+ { GIMP_UNDO_IMAGE_COLOR_MANAGED, "GIMP_UNDO_IMAGE_COLOR_MANAGED", "image-color-managed" },
+ { GIMP_UNDO_IMAGE_ATTRIBUTES, "GIMP_UNDO_IMAGE_ATTRIBUTES", "image-attributes" },
{ GIMP_UNDO_GUIDE, "GIMP_UNDO_GUIDE", "guide" },
{ GIMP_UNDO_SAMPLE_POINT, "GIMP_UNDO_SAMPLE_POINT", "sample-point" },
{ GIMP_UNDO_DRAWABLE, "GIMP_UNDO_DRAWABLE", "drawable" },
@@@ -915,8 -914,9 +916,9 @@@
{ GIMP_UNDO_IMAGE_SIZE, NC_("undo-type", "Image size"), NULL },
{ GIMP_UNDO_IMAGE_RESOLUTION, NC_("undo-type", "Image resolution change"), NULL },
{ GIMP_UNDO_IMAGE_GRID, NC_("undo-type", "Grid"), NULL },
- { GIMP_UNDO_IMAGE_METADATA, NC_("undo-type", "Change metadata"), NULL },
{ GIMP_UNDO_IMAGE_COLORMAP, NC_("undo-type", "Change indexed palette"), NULL },
+ { GIMP_UNDO_IMAGE_COLOR_MANAGED, NC_("undo-type", "Change color managed state"), NULL },
+ { GIMP_UNDO_IMAGE_ATTRIBUTES, "GIMP_UNDO_IMAGE_ATTRIBUTES", NULL },
{ GIMP_UNDO_GUIDE, NC_("undo-type", "Guide"), NULL },
{ GIMP_UNDO_SAMPLE_POINT, NC_("undo-type", "Sample Point"), NULL },
{ GIMP_UNDO_DRAWABLE, NC_("undo-type", "Layer/Channel"), NULL },
diff --cc app/core/core-enums.h
index 1ba45ca,17e73de..e0c9f98
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@@ -413,8 -413,9 +413,9 @@@ typedef enum /*< pdb-skip >*
GIMP_UNDO_IMAGE_SIZE, /*< desc="Image size" >*/
GIMP_UNDO_IMAGE_RESOLUTION, /*< desc="Image resolution change" >*/
GIMP_UNDO_IMAGE_GRID, /*< desc="Grid" >*/
- GIMP_UNDO_IMAGE_METADATA, /*< desc="Change metadata" >*/
GIMP_UNDO_IMAGE_COLORMAP, /*< desc="Change indexed palette" >*/
+ GIMP_UNDO_IMAGE_COLOR_MANAGED, /*< desc="Change color managed state" >*/
+ GIMP_UNDO_IMAGE_ATTRIBUTES, /*< desc="Change attributes >*/
GIMP_UNDO_GUIDE, /*< desc="Guide" >*/
GIMP_UNDO_SAMPLE_POINT, /*< desc="Sample Point" >*/
GIMP_UNDO_DRAWABLE, /*< desc="Layer/Channel" >*/
diff --cc app/core/core-types.h
index 9c2795e,11eaa62..57921bb
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@@ -154,26 -154,9 +154,10 @@@ typedef struct _GimpGroupLayer Gim
/* undo objects */
- typedef struct _GimpUndo GimpUndo;
- typedef struct _GimpImageUndo GimpImageUndo;
- typedef struct _GimpItemUndo GimpItemUndo;
- typedef struct _GimpItemPropUndo GimpItemPropUndo;
- typedef struct _GimpChannelUndo GimpChannelUndo;
- typedef struct _GimpChannelPropUndo GimpChannelPropUndo;
- typedef struct _GimpDrawableUndo GimpDrawableUndo;
- typedef struct _GimpDrawableModUndo GimpDrawableModUndo;
- typedef struct _GimpLayerMaskUndo GimpLayerMaskUndo;
- typedef struct _GimpLayerMaskPropUndo GimpLayerMaskPropUndo;
- typedef struct _GimpLayerUndo GimpLayerUndo;
- typedef struct _GimpLayerPropUndo GimpLayerPropUndo;
- typedef struct _GimpGroupLayerUndo GimpGroupLayerUndo;
- typedef struct _GimpMaskUndo GimpMaskUndo;
- typedef struct _GimpGuideUndo GimpGuideUndo;
- typedef struct _GimpSamplePointUndo GimpSamplePointUndo;
- typedef struct _GimpFloatingSelUndo GimpFloatingSelUndo;
- typedef struct _GimpUndoStack GimpUndoStack;
- typedef struct _GimpUndoAccumulator GimpUndoAccumulator;
+ typedef struct _GimpUndo GimpUndo;
+ typedef struct _GimpUndoStack GimpUndoStack;
+ typedef struct _GimpUndoAccumulator GimpUndoAccumulator;
+typedef struct _GimpViewableUndo GimpViewableUndo;
/* Symmetry transformations */
diff --cc app/core/gimpimage-undo-push.c
index 26f7042,86f9aed..c98321c
--- a/app/core/gimpimage-undo-push.c
+++ b/app/core/gimpimage-undo-push.c
@@@ -151,7 -149,19 +151,19 @@@ gimp_image_undo_push_image_colormap (Gi
}
GimpUndo *
+ gimp_image_undo_push_image_color_managed (GimpImage *image,
+ const gchar *undo_desc)
+ {
+ g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+ return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO,
+ GIMP_UNDO_IMAGE_COLOR_MANAGED, undo_desc,
+ GIMP_DIRTY_IMAGE,
+ NULL);
+ }
+
+ GimpUndo *
-gimp_image_undo_push_image_metadata (GimpImage *image,
+gimp_image_undo_push_image_attributes (GimpImage *image,
const gchar *undo_desc)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
diff --cc app/core/gimpimage-undo-push.h
index 390ba73,df531ec..4936048
--- a/app/core/gimpimage-undo-push.h
+++ b/app/core/gimpimage-undo-push.h
@@@ -38,7 -38,9 +38,9 @@@ GimpUndo * gimp_image_undo_push_image_g
GimpGrid *grid);
GimpUndo * gimp_image_undo_push_image_colormap (GimpImage *image,
const gchar *undo_desc);
+ GimpUndo * gimp_image_undo_push_image_color_managed (GimpImage *image,
+ const gchar *undo_desc);
-GimpUndo * gimp_image_undo_push_image_metadata (GimpImage *image,
+GimpUndo * gimp_image_undo_push_image_attributes (GimpImage *image,
const gchar *undo_desc);
GimpUndo * gimp_image_undo_push_image_parasite (GimpImage *image,
const gchar *undo_desc,
diff --cc app/core/gimpimageundo.c
index 2af4de0,b433e3d..359c416
--- a/app/core/gimpimageundo.c
+++ b/app/core/gimpimageundo.c
@@@ -188,9 -188,13 +188,13 @@@ gimp_image_undo_constructed (GObject *o
GIMP_IMAGE_COLORMAP_SIZE);
break;
+ case GIMP_UNDO_IMAGE_COLOR_MANAGED:
+ image_undo->is_color_managed = gimp_image_get_is_color_managed (image);
+ break;
+
- case GIMP_UNDO_IMAGE_METADATA:
- image_undo->metadata =
- gimp_metadata_duplicate (gimp_image_get_metadata (image));
+ case GIMP_UNDO_IMAGE_ATTRIBUTES:
+ image_undo->attributes =
+ gimp_attributes_duplicate (gimp_image_get_attributes (image));
break;
case GIMP_UNDO_PARASITE_ATTACH:
@@@ -468,17 -472,28 +472,29 @@@ gimp_image_undo_pop (GimpUnd
}
break;
+ case GIMP_UNDO_IMAGE_COLOR_MANAGED:
+ {
+ gboolean is_color_managed;
+
+ is_color_managed = gimp_image_get_is_color_managed (image);
+ gimp_image_set_is_color_managed (image, image_undo->is_color_managed,
+ FALSE);
+ image_undo->is_color_managed = is_color_managed;
+ }
+ break;
+
+ case GIMP_UNDO_IMAGE_METADATA:
+ case GIMP_UNDO_IMAGE_ATTRIBUTES:
{
- GimpMetadata *metadata;
+ GimpAttributes *attributes;
- metadata = gimp_metadata_duplicate (gimp_image_get_metadata (image));
+ attributes = gimp_attributes_duplicate (gimp_image_get_attributes (image));
- gimp_image_set_metadata (image, image_undo->metadata, FALSE);
+ gimp_image_set_attributes (image, image_undo->attributes, FALSE);
- if (image_undo->metadata)
- g_object_unref (image_undo->metadata);
- image_undo->metadata = metadata;
+ if (image_undo->attributes)
+ g_object_unref (image_undo->attributes);
+ image_undo->attributes = attributes;
}
break;
diff --cc app/core/gimpimageundo.h
index 3bc52e8,1f821d2..e68e13a
--- a/app/core/gimpimageundo.h
+++ b/app/core/gimpimageundo.h
@@@ -50,7 -51,8 +51,9 @@@ struct _GimpImageUnd
GimpGrid *grid;
gint num_colors;
guchar *colormap;
+ gboolean is_color_managed;
+ GimpMetadata *metadata;
+ GimpAttributes *attributes;
gchar *parasite_name;
GimpParasite *parasite;
};
diff --cc app/xcf/xcf-load.c
index 96c58b1,f48558a..de4a7b5
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@@ -47,8 -47,7 +47,8 @@@
#include "core/gimpimage-sample-points.h"
#include "core/gimpimage-undo.h"
#include "core/gimpitemstack.h"
+ #include "core/gimplayer-floating-selection.h"
+#include "core/gimpitem-metadata.h"
- #include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-new.h"
#include "core/gimplayermask.h"
#include "core/gimpparasitelist.h"
diff --cc configure.ac
index bc54837,a199396..c6fb85c
--- a/configure.ac
+++ b/configure.ac
@@@ -65,8 -66,8 +66,8 @@@ m4_define([pycairo_required_version], [
m4_define([poppler_required_version], [0.12.4])
m4_define([poppler_data_required_version], [0.4.7])
m4_define([libgudev_required_version], [167])
-m4_define([gexiv2_required_version], [0.6.1])
+m4_define([gexiv2_required_version], [0.10.3])
- m4_define([libmypaint_required_version], [1.1])
+ m4_define([libmypaint_required_version], [1.3.0])
m4_define([lcms_required_version], [2.6])
m4_define([libpng_required_version], [1.2.37])
m4_define([liblzma_required_version], [5.0.0])
diff --cc plug-ins/file-exr/file-exr.c
index 135a3c0,135a3c0..41b2392
--- a/plug-ins/file-exr/file-exr.c
+++ b/plug-ins/file-exr/file-exr.c
@@@ -167,14 -167,14 +167,15 @@@ load_image (const gchar *filename
GimpImageType layer_type;
gint32 layer;
const Babl *format;
-- GeglBuffer *buffer = NULL;
++ GeglBuffer *buffer = NULL;
gint bpp;
gint tile_height;
-- gchar *pixels = NULL;
++ gchar *pixels = NULL;
gint begin;
-- gint32 success = FALSE;
++ gint32 success = FALSE;
gchar *comment;
-- GimpMetadata *metadata;
++ GimpMetadata *metadata = NULL;
++ GimpAttributes *attributes = NULL;
gboolean have_metadata = FALSE;
guchar *exif_data;
guint exif_size;
@@@ -329,7 -329,7 +330,11 @@@
g_free (comment);
}
-- metadata = gimp_image_get_metadata (image);
++ attributes = gimp_image_get_attributes (image);
++ if (!attributes)
++ attributes = gimp_attributes_new ();
++
++ gimp_attributes_to_metadata (attributes, metadata, "image/x-exr");
if (metadata)
g_object_ref (metadata);
@@@ -367,7 -367,7 +372,11 @@@
}
if (have_metadata)
-- gimp_image_set_metadata (image, metadata);
++ {
++ gimp_attributes_from_metadata (attributes, metadata);
++ gimp_image_set_attributes (image, attributes);
++ g_object_unref (attributes);
++ }
g_object_unref (metadata);
diff --cc plug-ins/file-tiff/file-tiff.c
index 3abb4dc,aa57870..6b9405c
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@@ -470,12 -469,13 +470,13 @@@ run (const gchar *name
/* See bug 758909: clear TIFFTAG_MIN/MAXSAMPLEVALUE because
* exiv2 saves them with wrong type and the original values
- * could be invalid
+ * could be invalid, see also bug 761823
*/
- gexiv2_metadata_clear_tag (metadata, "Exif.Image.0x0118");
- gexiv2_metadata_clear_tag (metadata, "Exif.Image.0x0119");
+ gimp_attributes_remove_attribute (attributes, "Exif.Image.0x0118");
+ gimp_attributes_remove_attribute (attributes, "Exif.Image.0x0119");
+ gexiv2_metadata_clear_tag (metadata, "Exif.Image.PageNumber");
- gimp_metadata_set_bits_per_sample (metadata, saved_bpp);
+ gimp_attributes_set_bits_per_sample (attributes, saved_bpp);
if (tsvals.save_exif)
metadata_flags |= GIMP_METADATA_SAVE_EXIF;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
