[gimp/gimp-attributes-wip: 204/204] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip



commit 0303bd2a1ac135e9875a3da0f8578a3091601813
Merge: 64ee853 ed80db3
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sun May 1 19:19:09 2016 +0200

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
    
    Conflicts:
        plug-ins/file-tiff/file-tiff-load.c
        plug-ins/file-tiff/file-tiff-load.h
        plug-ins/file-tiff/file-tiff.c

 app/actions/file-actions.c                         |   18 +-
 app/actions/filters-actions.c                      |    6 +
 app/actions/fonts-commands.c                       |    2 +-
 app/actions/image-actions.c                        |   20 +-
 app/actions/image-commands.c                       |   73 +-
 app/actions/plug-in-commands.c                     |    1 +
 app/actions/procedure-commands.c                   |   22 +
 app/actions/procedure-commands.h                   |    1 +
 app/actions/select-actions.c                       |    4 +-
 app/actions/tool-options-actions.c                 |    2 +-
 app/actions/view-actions.c                         |    2 +-
 app/actions/windows-actions.c                      |    2 +-
 app/config/gimpcoreconfig.c                        |  665 +-
 app/config/gimpdisplayconfig.c                     |  388 +-
 app/config/gimpdisplayconfig.h                     |    1 -
 app/config/gimpdisplayoptions.c                    |  452 +-
 app/config/gimpgeglconfig.c                        |   74 +-
 app/config/gimpguiconfig.c                         |  567 +-
 app/config/gimpguiconfig.h                         |    8 +-
 app/config/gimppluginconfig.c                      |   63 +-
 app/config/gimprc-blurbs.h                         |   10 -
 app/core/Makefile.am                               |    2 +
 app/core/core-enums.c                              |    4 +
 app/core/core-enums.h                              |   16 +-
 app/core/gimp-templates.c                          |    2 +-
 app/core/gimp.c                                    |   43 +-
 app/core/gimpbrush.c                               |   13 +-
 app/core/gimpbrushcache.c                          |   13 +-
 app/core/gimpbuffer.c                              |  188 +-
 app/core/gimpchannel.c                             |   17 +-
 app/core/gimpdatafactory.c                         |    4 +-
 app/core/gimpdrawable-foreground-extract.c         |   38 +-
 app/core/gimpdrawable-preview.c                    |  149 +-
 app/core/gimpdrawable-preview.h                    |   14 +-
 app/core/gimpdrawable.c                            |  143 +-
 app/core/gimpdrawable.h                            |    4 +-
 app/core/gimpfilter.c                              |  160 +-
 app/core/gimpfilter.h                              |   11 +-
 app/core/gimpfilteredcontainer.c                   |    2 +-
 app/core/gimpfilterstack.c                         |  116 +-
 app/core/gimpgrouplayer.c                          |    7 +-
 app/core/gimpguide.c                               |    7 +-
 app/core/gimphistogram.c                           |   76 +-
 app/core/gimpimage-color-profile.c                 |  281 +-
 app/core/gimpimage-color-profile.h                 |   24 +
 app/core/gimpimage-convert-indexed.c               | 4473 ++
 app/core/gimpimage-convert-indexed.h               |   41 +
 app/core/gimpimage-convert-precision.c             |   66 +-
 app/core/gimpimage-convert-type.c                  | 4481 +--
 app/core/gimpimage-convert-type.h                  |   26 +-
 app/core/gimpimage-guides.c                        |    6 +
 app/core/gimpimage-preview.c                       |   83 +-
 app/core/gimpimage-preview.h                       |    4 +
 app/core/gimpimage-private.h                       |   15 +-
 app/core/gimpimage.c                               |    1 +
 app/core/gimpimagefile.c                           |    4 +-
 app/core/gimpimagemap.c                            |  130 +-
 app/core/gimpimagemap.h                            |    5 +-
 app/core/gimpitem.c                                |   68 +-
 app/core/gimpitem.h                                |    1 -
 app/core/gimpitemstack.c                           |   10 +-
 app/core/gimplayer.c                               |  126 +-
 app/core/gimplayermask.c                           |    6 +-
 app/core/gimplist.c                                |   98 +-
 app/core/gimplist.h                                |    4 +-
 app/core/gimpselection.c                           |    8 +-
 app/core/gimptaggedcontainer.c                     |    4 +-
 app/core/gimpundostack.c                           |    4 +-
 app/dialogs/Makefile.am                            |    4 +-
 app/dialogs/color-profile-dialog.c                 |  336 +-
 app/dialogs/color-profile-dialog.h                 |   21 +-
 ...vert-type-dialog.c => convert-indexed-dialog.c} |   38 +-
 ...vert-type-dialog.h => convert-indexed-dialog.h} |   14 +-
 app/display/Makefile.am                            |    7 +-
 app/display/gimpcanvas-style.c                     |   16 +
 app/display/gimpdisplayshell-dnd.c                 |    2 +-
 app/display/gimpdisplayshell-title.c               |    2 +-
 app/display/gimpdisplayshell-tool-events.c         |  103 +-
 app/display/gimpdisplayshell-tool-events.h         |    4 +
 app/display/gimpdisplayshell.c                     |    4 +
 app/display/gimpimagewindow.c                      |   35 +
 app/gegl/gimp-babl.c                               |   68 +-
 app/gegl/gimp-babl.h                               |    3 +-
 app/gegl/gimp-gegl-config.c                        |  204 +
 app/gegl/gimp-gegl-config.h                        |    2 +
 app/gegl/gimp-gegl-loops.c                         |    8 +-
 app/gui/splash.c                                   |   92 +-
 app/menus/windows-menu.c                           |    2 +-
 app/operations/gimplevelsconfig.c                  |    3 +
 app/operations/gimpoperationblend.c                |   12 +-
 app/operations/gimpoperationflood.c                |  368 +-
 app/pdb/color-cmds.c                               |    7 +-
 app/pdb/drawable-color-cmds.c                      |    9 +-
 app/pdb/fonts-cmds.c                               |    4 +-
 app/pdb/gimppdbcontext.c                           |    6 +-
 app/pdb/image-convert-cmds.c                       |   25 +-
 app/pdb/item-cmds.c                                |    2 +-
 app/pdb/selection-cmds.c                           |    4 +-
 app/plug-in/gimppluginmanager-file-procedure.c     |  253 +-
 app/sanity.c                                       |    1 +
 app/text/gimp-fonts.c                              |   77 +-
 app/text/gimp-fonts.h                              |    7 +-
 app/text/gimptextlayer.c                           |    6 +-
 app/text/gimptextundo.c                            |    2 +-
 app/tools/Makefile.am                              |    4 +
 app/tools/gimp-tools.c                             |  124 +-
 app/tools/gimpcolortool.c                          |  225 +-
 app/tools/gimpcolortool.h                          |   16 +-
 app/tools/gimpcurvestool.c                         |   68 +-
 app/tools/gimpflipoptions.c                        |    4 +-
 app/tools/gimpgegltool.c                           |    1 +
 app/tools/gimpguidetool.c                          |  381 +
 app/tools/gimpguidetool.h                          |   65 +
 app/tools/gimpimagemapoptions.c                    |   50 +
 app/tools/gimpimagemapoptions.h                    |    3 +
 app/tools/gimpimagemaptool.c                       |  646 +-
 app/tools/gimpimagemaptool.h                       |   10 +-
 app/tools/gimplevelstool.c                         |    4 +
 app/tools/gimpmovetool.c                           |  324 +-
 app/tools/gimpmovetool.h                           |    4 -
 app/tools/gimpoperationtool.c                      |    2 +-
 app/tools/gimpsamplepointtool.c                    |  348 +
 app/tools/gimpsamplepointtool.h                    |   60 +
 app/tools/gimptexttool-editor.c                    |  115 +-
 app/tools/gimptexttool-editor.h                    |   52 +-
 app/tools/gimptexttool.c                           |    4 +-
 app/tools/gimptexttool.h                           |    3 -
 app/widgets/gimpcolorbar.c                         |    1 +
 app/widgets/gimpdatafactoryview.c                  |   16 +
 app/widgets/gimpdeviceeditor.c                     |    2 +-
 app/widgets/gimpdevices.c                          |    2 +-
 app/widgets/gimpdevicestatus.c                     |    2 +-
 app/widgets/gimpdockwindow.c                       |    2 +-
 app/widgets/gimphistogrameditor.c                  |    1 +
 app/widgets/gimppropgui.c                          |   45 +-
 app/widgets/gimpsettingsbox.c                      |    4 +-
 app/widgets/gimpundoeditor.c                       |    4 +-
 app/widgets/gimpviewrenderer.c                     |   14 +-
 app/xcf/xcf-load.c                                 |   16 +-
 configure.ac                                       |   24 +-
 docs/gimp.1.in                                     |    8 +-
 icons/Color/12/gimp-close.png                      |  Bin 565 -> 491 bytes
 icons/Color/12/gimp-linked.png                     |  Bin 605 -> 576 bytes
 icons/Color/12/gimp-menu-left.png                  |  Bin 579 -> 517 bytes
 icons/Color/12/gimp-menu-right.png                 |  Bin 596 -> 526 bytes
 icons/Color/12/gimp-quick-mask-off.png             |  Bin 500 -> 315 bytes
 icons/Color/12/gimp-quick-mask-on.png              |  Bin 375 -> 309 bytes
 icons/Color/12/gimp-swap-colors.png                |  Bin 484 -> 604 bytes
 icons/Color/12/gimp-visible.png                    |  Bin 537 -> 584 bytes
 icons/Color/12/gimp-zoom-follow-window.png         |  Bin 638 -> 566 bytes
 icons/Color/16/gimp-cap-butt.png                   |  Bin 453 -> 390 bytes
 icons/Color/16/gimp-cap-round.png                  |  Bin 700 -> 679 bytes
 icons/Color/16/gimp-cap-square.png                 |  Bin 513 -> 489 bytes
 icons/Color/16/gimp-center.png                     |  Bin 729 -> 803 bytes
 icons/Color/16/gimp-channel-alpha.png              |  Bin 731 -> 808 bytes
 icons/Color/16/gimp-channel-blue.png               |  Bin 732 -> 742 bytes
 icons/Color/16/gimp-channel-gray.png               |  Bin 715 -> 740 bytes
 icons/Color/16/gimp-channel-green.png              |  Bin 736 -> 748 bytes
 icons/Color/16/gimp-channel-indexed.png            |  Bin 879 -> 838 bytes
 icons/Color/16/gimp-channel-red.png                |  Bin 735 -> 769 bytes
 icons/Color/16/gimp-channel.png                    |  Bin 760 -> 720 bytes
 icons/Color/16/gimp-channels.png                   |  Bin 837 -> 772 bytes
 icons/Color/16/gimp-color-pick-from-screen.png     |  Bin 741 -> 805 bytes
 icons/Color/16/gimp-colormap.png                   |  Bin 629 -> 677 bytes
 icons/Color/16/gimp-controller-keyboard.png        |  Bin 1120 -> 1072 bytes
 icons/Color/16/gimp-controller-midi.png            |  Bin 460 -> 457 bytes
 icons/Color/16/gimp-convert-grayscale.png          |  Bin 1084 -> 996 bytes
 icons/Color/16/gimp-convert-indexed.png            |  Bin 1181 -> 1174 bytes
 icons/Color/16/gimp-convert-rgb.png                |  Bin 1133 -> 1123 bytes
 icons/Color/16/gimp-cursor.png                     |  Bin 574 -> 582 bytes
 icons/Color/16/gimp-curve-free.png                 |  Bin 899 -> 835 bytes
 icons/Color/16/gimp-curve-smooth.png               |  Bin 739 -> 668 bytes
 icons/Color/16/gimp-device-status.png              |  Bin 973 -> 938 bytes
 icons/Color/16/gimp-display-filter-colorblind.png  |  Bin 703 -> 727 bytes
 icons/Color/16/gimp-display-filter-contrast.png    |  Bin 548 -> 615 bytes
 icons/Color/16/gimp-display-filter-gamma.png       |  Bin 667 -> 718 bytes
 icons/Color/16/gimp-display-filter-lcms.png        |  Bin 632 -> 697 bytes
 icons/Color/16/gimp-display-filter-proof.png       |  Bin 744 -> 707 bytes
 icons/Color/16/gimp-duplicate.png                  |  Bin 494 -> 484 bytes
 icons/Color/16/gimp-dynamics.png                   |  Bin 773 -> 774 bytes
 icons/Color/16/gimp-edit.png                       |  Bin 805 -> 672 bytes
 icons/Color/16/gimp-flip-horizontal.png            |  Bin 546 -> 501 bytes
 icons/Color/16/gimp-flip-vertical.png              |  Bin 608 -> 499 bytes
 icons/Color/16/gimp-floating-selection.png         |  Bin 912 -> 483 bytes
 icons/Color/16/gimp-gegl.png                       |  Bin 920 -> 1096 bytes
 icons/Color/16/gimp-gradient-bilinear.png          |  Bin 604 -> 476 bytes
 .../Color/16/gimp-gradient-conical-asymmetric.png  |  Bin 756 -> 639 bytes
 icons/Color/16/gimp-gradient-conical-symmetric.png |  Bin 733 -> 726 bytes
 icons/Color/16/gimp-gradient-linear.png            |  Bin 452 -> 299 bytes
 icons/Color/16/gimp-gradient-radial.png            |  Bin 676 -> 640 bytes
 .../Color/16/gimp-gradient-shapeburst-angular.png  |  Bin 796 -> 803 bytes
 .../Color/16/gimp-gradient-shapeburst-dimpled.png  |  Bin 768 -> 786 bytes
 .../16/gimp-gradient-shapeburst-spherical.png      |  Bin 749 -> 678 bytes
 .../16/gimp-gradient-spiral-anticlockwise.png      |  Bin 990 -> 981 bytes
 icons/Color/16/gimp-gradient-spiral-clockwise.png  |  Bin 968 -> 988 bytes
 icons/Color/16/gimp-gradient-square.png            |  Bin 847 -> 784 bytes
 icons/Color/16/gimp-histogram-linear.png           |  Bin 536 -> 469 bytes
 icons/Color/16/gimp-histogram-logarithmic.png      |  Bin 507 -> 485 bytes
 icons/Color/16/gimp-histogram.png                  |  Bin 694 -> 836 bytes
 icons/Color/16/gimp-image.png                      |  Bin 533 -> 804 bytes
 icons/Color/16/gimp-images.png                     |  Bin 795 -> 791 bytes
 icons/Color/16/gimp-input-device.png               |  Bin 832 -> 864 bytes
 icons/Color/16/gimp-invert.png                     |  Bin 534 -> 492 bytes
 icons/Color/16/gimp-join-bevel.png                 |  Bin 650 -> 723 bytes
 icons/Color/16/gimp-join-miter.png                 |  Bin 437 -> 495 bytes
 icons/Color/16/gimp-join-round.png                 |  Bin 731 -> 788 bytes
 icons/Color/16/gimp-landscape.png                  |  Bin 756 -> 743 bytes
 icons/Color/16/gimp-layer-to-imagesize.png         |  Bin 950 -> 895 bytes
 icons/Color/16/gimp-layer.png                      |  Bin 531 -> 553 bytes
 icons/Color/16/gimp-layers.png                     |  Bin 718 -> 734 bytes
 icons/Color/16/gimp-list.png                       |  Bin 555 -> 382 bytes
 icons/Color/16/gimp-merge-down.png                 |  Bin 698 -> 678 bytes
 icons/Color/16/gimp-move-to-screen.png             |  Bin 883 -> 872 bytes
 icons/Color/16/gimp-paste-as-new.png               |  Bin 817 -> 790 bytes
 icons/Color/16/gimp-paste-into.png                 |  Bin 985 -> 778 bytes
 icons/Color/16/gimp-path-stroke.png                |  Bin 833 -> 834 bytes
 icons/Color/16/gimp-path.png                       |  Bin 575 -> 642 bytes
 icons/Color/16/gimp-paths.png                      |  Bin 769 -> 822 bytes
 icons/Color/16/gimp-portrait.png                   |  Bin 712 -> 685 bytes
 icons/Color/16/gimp-reset.png                      |  Bin 828 -> 789 bytes
 icons/Color/16/gimp-reshow-filter.png              |  Bin 1040 -> 1003 bytes
 icons/Color/16/gimp-resize.png                     |  Bin 843 -> 690 bytes
 icons/Color/16/gimp-rotate-180.png                 |  Bin 721 -> 747 bytes
 icons/Color/16/gimp-rotate-270.png                 |  Bin 695 -> 723 bytes
 icons/Color/16/gimp-rotate-90.png                  |  Bin 697 -> 734 bytes
 icons/Color/16/gimp-sample-point.png               |  Bin 737 -> 711 bytes
 icons/Color/16/gimp-scale.png                      |  Bin 770 -> 681 bytes
 icons/Color/16/gimp-selection-add.png              |  Bin 735 -> 590 bytes
 icons/Color/16/gimp-selection-all.png              |  Bin 523 -> 328 bytes
 icons/Color/16/gimp-selection-border.png           |  Bin 606 -> 350 bytes
 icons/Color/16/gimp-selection-grow.png             |  Bin 830 -> 579 bytes
 icons/Color/16/gimp-selection-intersect.png        |  Bin 708 -> 556 bytes
 icons/Color/16/gimp-selection-none.png             |  Bin 674 -> 507 bytes
 icons/Color/16/gimp-selection-replace.png          |  Bin 836 -> 761 bytes
 icons/Color/16/gimp-selection-shrink.png           |  Bin 758 -> 519 bytes
 icons/Color/16/gimp-selection-stroke.png           |  Bin 913 -> 805 bytes
 icons/Color/16/gimp-selection-subtract.png         |  Bin 734 -> 570 bytes
 icons/Color/16/gimp-selection-to-channel.png       |  Bin 845 -> 763 bytes
 icons/Color/16/gimp-selection-to-path.png          |  Bin 846 -> 795 bytes
 icons/Color/16/gimp-selection.png                  |  Bin 534 -> 494 bytes
 icons/Color/16/gimp-symmetry.png                   |  Bin 1123 -> 1099 bytes
 icons/Color/16/gimp-text-layer.png                 |  Bin 729 -> 674 bytes
 icons/Color/16/gimp-tool-airbrush.png              |  Bin 826 -> 861 bytes
 icons/Color/16/gimp-tool-align.png                 |  Bin 429 -> 439 bytes
 icons/Color/16/gimp-tool-blend.png                 |  Bin 368 -> 990 bytes
 icons/Color/16/gimp-tool-blur.png                  |  Bin 762 -> 828 bytes
 icons/Color/16/gimp-tool-brightness-contrast.png   |  Bin 819 -> 827 bytes
 icons/Color/16/gimp-tool-bucket-fill.png           |  Bin 893 -> 963 bytes
 icons/Color/16/gimp-tool-by-color-select.png       |  Bin 951 -> 800 bytes
 icons/Color/16/gimp-tool-cage.png                  |  Bin 1099 -> 1015 bytes
 icons/Color/16/gimp-tool-clone.png                 |  Bin 813 -> 825 bytes
 icons/Color/16/gimp-tool-color-balance.png         |  Bin 810 -> 569 bytes
 icons/Color/16/gimp-tool-color-picker.png          |  Bin 677 -> 706 bytes
 icons/Color/16/gimp-tool-colorize.png              |  Bin 494 -> 569 bytes
 icons/Color/16/gimp-tool-crop.png                  |  Bin 828 -> 639 bytes
 icons/Color/16/gimp-tool-curves.png                |  Bin 985 -> 599 bytes
 icons/Color/16/gimp-tool-desaturate.png            |  Bin 622 -> 849 bytes
 icons/Color/16/gimp-tool-dodge.png                 |  Bin 701 -> 762 bytes
 icons/Color/16/gimp-tool-ellipse-select.png        |  Bin 801 -> 816 bytes
 icons/Color/16/gimp-tool-eraser.png                |  Bin 408 -> 722 bytes
 icons/Color/16/gimp-tool-flip.png                  |  Bin 783 -> 785 bytes
 icons/Color/16/gimp-tool-foreground-select.png     |  Bin 869 -> 642 bytes
 icons/Color/16/gimp-tool-free-select.png           |  Bin 893 -> 884 bytes
 icons/Color/16/gimp-tool-fuzzy-select.png          |  Bin 853 -> 843 bytes
 icons/Color/16/gimp-tool-handle-transform.png      |  Bin 902 -> 857 bytes
 icons/Color/16/gimp-tool-heal.png                  |  Bin 964 -> 1031 bytes
 icons/Color/16/gimp-tool-hue-saturation.png        |  Bin 673 -> 523 bytes
 icons/Color/16/gimp-tool-ink.png                   |  Bin 886 -> 800 bytes
 icons/Color/16/gimp-tool-iscissors.png             |  Bin 944 -> 967 bytes
 icons/Color/16/gimp-tool-levels.png                |  Bin 677 -> 606 bytes
 icons/Color/16/gimp-tool-measure.png               |  Bin 859 -> 851 bytes
 icons/Color/16/gimp-tool-move.png                  |  Bin 787 -> 814 bytes
 icons/Color/16/gimp-tool-mypaint-brush.png         |  Bin 685 -> 735 bytes
 icons/Color/16/gimp-tool-n-point-deformation.png   |  Bin 833 -> 935 bytes
 icons/Color/16/gimp-tool-options.png               |  Bin 666 -> 666 bytes
 icons/Color/16/gimp-tool-paintbrush.png            |  Bin 664 -> 718 bytes
 icons/Color/16/gimp-tool-path.png                  |  Bin 908 -> 832 bytes
 icons/Color/16/gimp-tool-pencil.png                |  Bin 682 -> 779 bytes
 icons/Color/16/gimp-tool-perspective-clone.png     |  Bin 830 -> 938 bytes
 icons/Color/16/gimp-tool-perspective.png           |  Bin 586 -> 936 bytes
 icons/Color/16/gimp-tool-posterize.png             |  Bin 418 -> 367 bytes
 icons/Color/16/gimp-tool-preset.png                |  Bin 1047 -> 857 bytes
 icons/Color/16/gimp-tool-rect-select.png           |  Bin 368 -> 323 bytes
 icons/Color/16/gimp-tool-rotate.png                |  Bin 899 -> 927 bytes
 icons/Color/16/gimp-tool-scale.png                 |  Bin 823 -> 594 bytes
 icons/Color/16/gimp-tool-seamless-clone.png        |  Bin 843 -> 925 bytes
 icons/Color/16/gimp-tool-shear.png                 |  Bin 756 -> 782 bytes
 icons/Color/16/gimp-tool-smudge.png                |  Bin 737 -> 776 bytes
 icons/Color/16/gimp-tool-text.png                  |  Bin 774 -> 817 bytes
 icons/Color/16/gimp-tool-threshold.png             |  Bin 713 -> 580 bytes
 icons/Color/16/gimp-tool-unified-transform.png     |  Bin 744 -> 667 bytes
 icons/Color/16/gimp-tool-warp.png                  |  Bin 771 -> 809 bytes
 icons/Color/16/gimp-tool-zoom.png                  |  Bin 877 -> 930 bytes
 icons/Color/16/gimp-tools.png                      |  Bin 1013 -> 1084 bytes
 icons/Color/16/gimp-warning.png                    |  Bin 748 -> 770 bytes
 icons/Color/18/gimp-color-picker-black.png         |  Bin 639 -> 576 bytes
 icons/Color/18/gimp-color-picker-gray.png          |  Bin 644 -> 594 bytes
 icons/Color/18/gimp-color-picker-white.png         |  Bin 620 -> 568 bytes
 icons/Color/20/gimp-linked.png                     |  Bin 1010 -> 980 bytes
 icons/Color/20/gimp-visible.png                    |  Bin 914 -> 964 bytes
 icons/Color/22/gimp-char-picker.png                |  Bin 1039 -> 1037 bytes
 icons/Color/22/gimp-dynamics.png                   |  Bin 1090 -> 1156 bytes
 icons/Color/22/gimp-gegl.png                       |  Bin 1346 -> 0 bytes
 icons/Color/22/gimp-histogram.png                  |  Bin 882 -> 872 bytes
 icons/Color/22/gimp-input-device.png               |  Bin 1134 -> 1281 bytes
 icons/Color/22/gimp-landscape.png                  |  Bin 1018 -> 967 bytes
 icons/Color/22/gimp-letter-spacing.png             |  Bin 1258 -> 673 bytes
 icons/Color/22/gimp-line-spacing.png               |  Bin 886 -> 650 bytes
 icons/Color/22/gimp-path.png                       |  Bin 799 -> 825 bytes
 icons/Color/22/gimp-paths.png                      |  Bin 1072 -> 1174 bytes
 icons/Color/22/gimp-portrait.png                   |  Bin 918 -> 918 bytes
 icons/Color/22/gimp-prefs-default-grid.png         |  Bin 1164 -> 1188 bytes
 icons/Color/22/gimp-tool-preset.png                |  Bin 0 -> 1382 bytes
 icons/Color/24/gimp-center.png                     |  Bin 1204 -> 1341 bytes
 icons/Color/24/gimp-channel-alpha.png              |  Bin 1117 -> 1211 bytes
 icons/Color/24/gimp-channel-blue.png               |  Bin 1137 -> 1103 bytes
 icons/Color/24/gimp-channel-gray.png               |  Bin 1074 -> 1086 bytes
 icons/Color/24/gimp-channel-green.png              |  Bin 1149 -> 1097 bytes
 icons/Color/24/gimp-channel-indexed.png            |  Bin 1373 -> 1275 bytes
 icons/Color/24/gimp-channel-red.png                |  Bin 1149 -> 1145 bytes
 icons/Color/24/gimp-channel.png                    |  Bin 1192 -> 1015 bytes
 icons/Color/24/gimp-channels.png                   |  Bin 1270 -> 1153 bytes
 icons/Color/24/gimp-colormap.png                   |  Bin 922 -> 933 bytes
 icons/Color/24/gimp-controller-keyboard.png        |  Bin 1859 -> 1799 bytes
 icons/Color/24/gimp-controller-midi.png            |  Bin 556 -> 523 bytes
 icons/Color/24/gimp-cursor.png                     |  Bin 779 -> 726 bytes
 icons/Color/24/gimp-device-status.png              |  Bin 1580 -> 1507 bytes
 icons/Color/24/gimp-display-filter-colorblind.png  |  Bin 1097 -> 1018 bytes
 icons/Color/24/gimp-display-filter-contrast.png    |  Bin 831 -> 882 bytes
 icons/Color/24/gimp-display-filter-gamma.png       |  Bin 1085 -> 1100 bytes
 icons/Color/24/gimp-display-filter-lcms.png        |  Bin 925 -> 980 bytes
 icons/Color/24/gimp-display-filter-proof.png       |  Bin 1101 -> 1150 bytes
 icons/Color/24/gimp-floating-selection.png         |  Bin 1404 -> 763 bytes
 icons/Color/24/gimp-gegl.png                       |  Bin 0 -> 1821 bytes
 icons/Color/24/gimp-gegl.svg                       |  163 +
 icons/Color/24/gimp-gravity-east.png               |  Bin 621 -> 612 bytes
 icons/Color/24/gimp-gravity-north-east.png         |  Bin 696 -> 771 bytes
 icons/Color/24/gimp-gravity-north-west.png         |  Bin 670 -> 745 bytes
 icons/Color/24/gimp-gravity-north.png              |  Bin 577 -> 564 bytes
 icons/Color/24/gimp-gravity-south-east.png         |  Bin 688 -> 756 bytes
 icons/Color/24/gimp-gravity-south-west.png         |  Bin 598 -> 754 bytes
 icons/Color/24/gimp-gravity-south.png              |  Bin 552 -> 542 bytes
 icons/Color/24/gimp-gravity-west.png               |  Bin 640 -> 606 bytes
 icons/Color/24/gimp-hcenter.png                    |  Bin 810 -> 634 bytes
 icons/Color/24/gimp-hchain-broken.png              |  Bin 1129 -> 872 bytes
 icons/Color/24/gimp-hchain.png                     |  Bin 1112 -> 860 bytes
 icons/Color/24/gimp-hfill.png                      |  Bin 929 -> 702 bytes
 icons/Color/24/gimp-image.png                      |  Bin 1111 -> 1188 bytes
 icons/Color/24/gimp-images.png                     |  Bin 1140 -> 1095 bytes
 icons/Color/24/gimp-layer-mask.png                 |  Bin 1172 -> 1206 bytes
 icons/Color/24/gimp-layer.png                      |  Bin 714 -> 712 bytes
 icons/Color/24/gimp-move-to-screen.png             |  Bin 1362 -> 1368 bytes
 icons/Color/24/gimp-symmetry.png                   |  Bin 1772 -> 1754 bytes
 icons/Color/24/gimp-text-dir-ltr.png               |  Bin 1003 -> 952 bytes
 icons/Color/24/gimp-text-dir-rtl.png               |  Bin 824 -> 785 bytes
 icons/Color/24/gimp-text-layer.png                 |  Bin 1015 -> 983 bytes
 icons/Color/24/gimp-tool-airbrush.png              |  Bin 1328 -> 1313 bytes
 icons/Color/24/gimp-tool-airbrush.svg              |  227 +
 icons/Color/24/gimp-tool-align.png                 |  Bin 686 -> 537 bytes
 icons/Color/24/gimp-tool-align.svg                 |  199 +
 icons/Color/24/gimp-tool-blend.png                 |  Bin 1587 -> 1582 bytes
 .../24/gimp-tool-blend.svg}                        |  128 +-
 icons/Color/24/gimp-tool-blur.png                  |  Bin 1318 -> 1350 bytes
 icons/Color/24/gimp-tool-blur.svg                  |  188 +
 icons/Color/24/gimp-tool-brightness-contrast.png   |  Bin 1179 -> 1195 bytes
 icons/Color/24/gimp-tool-brightness-contrast.svg   |  223 +
 icons/Color/24/gimp-tool-bucket-fill.png           |  Bin 1632 -> 1614 bytes
 .../24/gimp-tool-bucket-fill.svg}                  |  126 +-
 icons/Color/24/gimp-tool-by-color-select.png       |  Bin 1491 -> 1504 bytes
 icons/Color/24/gimp-tool-by-color-select.svg       |  336 +
 icons/Color/24/gimp-tool-cage.png                  |  Bin 1732 -> 1462 bytes
 icons/Color/24/gimp-tool-cage.svg                  |  305 +
 icons/Color/24/gimp-tool-clone.png                 |  Bin 1264 -> 1280 bytes
 icons/Color/24/gimp-tool-clone.svg                 |  216 +
 icons/Color/24/gimp-tool-color-balance.png         |  Bin 989 -> 771 bytes
 icons/Color/24/gimp-tool-color-balance.svg         |  190 +
 icons/Color/24/gimp-tool-color-picker.png          |  Bin 1073 -> 1060 bytes
 icons/Color/24/gimp-tool-color-picker.svg          |  167 +
 icons/Color/24/gimp-tool-colorize.png              |  Bin 740 -> 737 bytes
 icons/Color/24/gimp-tool-colorize.svg              |  152 +
 icons/Color/24/gimp-tool-crop.png                  |  Bin 1286 -> 600 bytes
 .../24/gimp-tool-crop.svg}                         |   64 +-
 icons/Color/24/gimp-tool-curves.png                |  Bin 1562 -> 949 bytes
 icons/Color/24/gimp-tool-curves.svg                |  216 +
 icons/Color/24/gimp-tool-desaturate.png            |  Bin 1300 -> 1164 bytes
 icons/Color/24/gimp-tool-desaturate.svg            |  200 +
 icons/Color/24/gimp-tool-dodge.png                 |  Bin 1155 -> 1142 bytes
 icons/Color/24/gimp-tool-dodge.svg                 |  222 +
 icons/Color/24/gimp-tool-ellipse-select.png        |  Bin 1266 -> 1264 bytes
 icons/Color/24/gimp-tool-ellipse-select.svg        |  359 +
 icons/Color/24/gimp-tool-eraser.png                |  Bin 1120 -> 1081 bytes
 icons/Color/24/gimp-tool-eraser.svg                |  169 +
 icons/Color/24/gimp-tool-flip.png                  |  Bin 1209 -> 1036 bytes
 icons/Color/24/gimp-tool-flip.svg                  |  134 +
 icons/Color/24/gimp-tool-foreground-select.png     |  Bin 1330 -> 901 bytes
 icons/Color/24/gimp-tool-foreground-select.svg     |  467 +
 icons/Color/24/gimp-tool-free-select.png           |  Bin 1381 -> 1344 bytes
 icons/Color/24/gimp-tool-free-select.svg           |  244 +
 icons/Color/24/gimp-tool-fuzzy-select.png          |  Bin 1356 -> 1356 bytes
 icons/Color/24/gimp-tool-fuzzy-select.svg          |  214 +
 icons/Color/24/gimp-tool-handle-transform.png      |  Bin 1499 -> 1274 bytes
 icons/Color/24/gimp-tool-handle-transform.svg      |  249 +
 icons/Color/24/gimp-tool-heal.png                  |  Bin 1638 -> 1658 bytes
 icons/Color/24/gimp-tool-heal.svg                  |  233 +
 icons/Color/24/gimp-tool-hue-saturation.png        |  Bin 823 -> 662 bytes
 icons/Color/24/gimp-tool-hue-saturation.svg        |  204 +
 icons/Color/24/gimp-tool-ink.png                   |  Bin 1334 -> 1182 bytes
 icons/Color/24/gimp-tool-ink.svg                   |  201 +
 icons/Color/24/gimp-tool-iscissors.png             |  Bin 1656 -> 1641 bytes
 icons/Color/24/gimp-tool-iscissors.svg             |  266 +
 icons/Color/24/gimp-tool-levels.png                |  Bin 892 -> 840 bytes
 icons/Color/24/gimp-tool-levels.svg                |  202 +
 icons/Color/24/gimp-tool-measure.png               |  Bin 1327 -> 1348 bytes
 .../24/gimp-tool-measure.svg}                      |  101 +-
 icons/Color/24/gimp-tool-move.png                  |  Bin 1212 -> 1215 bytes
 icons/Color/24/gimp-tool-move.svg                  |  254 +
 icons/Color/24/gimp-tool-mypaint-brush.png         |  Bin 1179 -> 1142 bytes
 icons/Color/24/gimp-tool-mypaint-brush.svg         |  233 +
 icons/Color/24/gimp-tool-n-point-deformation.png   |  Bin 1358 -> 1500 bytes
 icons/Color/24/gimp-tool-n-point-deformation.svg   |  251 +
 icons/Color/24/gimp-tool-options.png               |  Bin 903 -> 991 bytes
 icons/Color/24/gimp-tool-paintbrush.png            |  Bin 1110 -> 1071 bytes
 icons/Color/24/gimp-tool-paintbrush.svg            |  235 +
 icons/Color/24/gimp-tool-path.png                  |  Bin 1324 -> 1145 bytes
 icons/Color/24/gimp-tool-path.svg                  |  139 +
 icons/Color/24/gimp-tool-pencil.png                |  Bin 1111 -> 1165 bytes
 icons/Color/24/gimp-tool-pencil.svg                |  218 +
 icons/Color/24/gimp-tool-perspective-clone.png     |  Bin 1404 -> 1336 bytes
 icons/Color/24/gimp-tool-perspective-clone.svg     |  238 +
 icons/Color/24/gimp-tool-perspective.png           |  Bin 1402 -> 1389 bytes
 icons/Color/24/gimp-tool-perspective.svg           |  153 +
 icons/Color/24/gimp-tool-posterize.png             |  Bin 457 -> 376 bytes
 .../24/gimp-tool-posterize.svg}                    |  128 +-
 icons/Color/24/gimp-tool-rect-select.png           |  Bin 996 -> 384 bytes
 icons/Color/24/gimp-tool-rect-select.svg           |  396 +
 icons/Color/24/gimp-tool-rotate.png                |  Bin 1463 -> 1496 bytes
 icons/Color/24/gimp-tool-rotate.svg                |  144 +
 icons/Color/24/gimp-tool-scale.png                 |  Bin 1395 -> 745 bytes
 icons/Color/24/gimp-tool-scale.svg                 |  138 +
 icons/Color/24/gimp-tool-seamless-clone.png        |  Bin 1405 -> 1164 bytes
 icons/Color/24/gimp-tool-seamless-clone.svg        |  309 +
 icons/Color/24/gimp-tool-shear.png                 |  Bin 1215 -> 1169 bytes
 icons/Color/24/gimp-tool-shear.svg                 |  122 +
 icons/Color/24/gimp-tool-smudge.png                |  Bin 1173 -> 1441 bytes
 icons/Color/24/gimp-tool-smudge.svg                |  264 +
 icons/Color/24/gimp-tool-text.png                  |  Bin 1208 -> 1189 bytes
 icons/Color/24/gimp-tool-text.svg                  |  176 +
 icons/Color/24/gimp-tool-threshold.png             |  Bin 936 -> 846 bytes
 icons/Color/24/gimp-tool-threshold.svg             |  188 +
 icons/Color/24/gimp-tool-unified-transform.png     |  Bin 1235 -> 885 bytes
 icons/Color/24/gimp-tool-unified-transform.svg     |  161 +
 icons/Color/24/gimp-tool-warp.png                  |  Bin 1153 -> 1153 bytes
 icons/Color/24/gimp-tool-warp.svg                  |  170 +
 icons/Color/24/gimp-tool-zoom.png                  |  Bin 1517 -> 1503 bytes
 icons/Color/24/gimp-tool-zoom.svg                  |  266 +
 icons/Color/24/gimp-tools.png                      |  Bin 1695 -> 1778 bytes
 icons/Color/24/gimp-vcenter.png                    |  Bin 696 -> 689 bytes
 icons/Color/24/gimp-vchain-broken.png              |  Bin 1182 -> 991 bytes
 icons/Color/24/gimp-vchain.png                     |  Bin 1179 -> 1020 bytes
 icons/Color/24/gimp-vfill.png                      |  Bin 769 -> 638 bytes
 icons/Color/24/gimp-warning.png                    |  Bin 1176 -> 1208 bytes
 icons/Color/32/gimp-channel-alpha.png              |  Bin 1607 -> 1707 bytes
 icons/Color/32/gimp-channel-blue.png               |  Bin 1606 -> 1505 bytes
 icons/Color/32/gimp-channel-gray.png               |  Bin 1521 -> 1480 bytes
 icons/Color/32/gimp-channel-green.png              |  Bin 1619 -> 1489 bytes
 icons/Color/32/gimp-channel-indexed.png            |  Bin 1914 -> 1764 bytes
 icons/Color/32/gimp-channel-red.png                |  Bin 1603 -> 1586 bytes
 icons/Color/32/gimp-channel.png                    |  Bin 1425 -> 1424 bytes
 icons/Color/32/gimp-floating-selection.png         |  Bin 1966 -> 567 bytes
 icons/Color/32/gimp-image.png                      |  Bin 1551 -> 1565 bytes
 icons/Color/32/gimp-layer-mask.png                 |  Bin 1542 -> 1542 bytes
 icons/Color/32/gimp-layer.png                      |  Bin 909 -> 845 bytes
 icons/Color/32/gimp-text-layer.png                 |  Bin 1296 -> 1182 bytes
 icons/Color/48/gimp-channel-alpha.png              |  Bin 2495 -> 2728 bytes
 icons/Color/48/gimp-channel-blue.png               |  Bin 2561 -> 2307 bytes
 icons/Color/48/gimp-channel-gray.png               |  Bin 2312 -> 2218 bytes
 icons/Color/48/gimp-channel-green.png              |  Bin 2543 -> 2268 bytes
 icons/Color/48/gimp-channel-indexed.png            |  Bin 3033 -> 2744 bytes
 icons/Color/48/gimp-channel-red.png                |  Bin 2489 -> 2417 bytes
 icons/Color/48/gimp-channel.png                    |  Bin 2328 -> 2267 bytes
 icons/Color/48/gimp-floating-selection.png         |  Bin 3037 -> 803 bytes
 icons/Color/48/gimp-image.png                      |  Bin 2444 -> 2497 bytes
 icons/Color/48/gimp-layer-mask.png                 |  Bin 2335 -> 2326 bytes
 icons/Color/48/gimp-layer.png                      |  Bin 1206 -> 1157 bytes
 icons/Color/48/gimp-prefs-default-grid.png         |  Bin 3138 -> 3015 bytes
 icons/Color/48/gimp-text-layer.png                 |  Bin 1746 -> 1715 bytes
 icons/Color/64/gimp-error.png                      |  Bin 4011 -> 4176 bytes
 icons/Color/64/gimp-question.png                   |  Bin 4937 -> 5226 bytes
 icons/Color/color-scalable.svg                     |45400 ++++++++++----------
 icons/Color/scalable/gimp-cap-butt.svg             |  198 +-
 icons/Color/scalable/gimp-cap-round.svg            |  189 +-
 icons/Color/scalable/gimp-cap-square.svg           |  192 +-
 icons/Color/scalable/gimp-center.svg               |  168 +-
 icons/Color/scalable/gimp-channel-alpha.svg        |  400 +-
 icons/Color/scalable/gimp-channel-blue.svg         |  325 +-
 icons/Color/scalable/gimp-channel-gray.svg         |  330 +-
 icons/Color/scalable/gimp-channel-green.svg        |  325 +-
 icons/Color/scalable/gimp-channel-indexed.svg      |  400 +-
 icons/Color/scalable/gimp-channel-red.svg          |  330 +-
 icons/Color/scalable/gimp-channel.svg              |  467 +-
 icons/Color/scalable/gimp-channels.svg             |  653 +-
 icons/Color/scalable/gimp-char-picker.svg          |  361 +-
 icons/Color/scalable/gimp-close.svg                |  161 +-
 .../Color/scalable/gimp-color-pick-from-screen.svg |  398 +-
 icons/Color/scalable/gimp-color-picker-black.svg   |  297 +-
 icons/Color/scalable/gimp-color-picker-gray.svg    |  297 +-
 icons/Color/scalable/gimp-color-picker-white.svg   |  297 +-
 icons/Color/scalable/gimp-colormap.svg             |  352 +-
 icons/Color/scalable/gimp-controller-keyboard.svg  | 1544 +-
 icons/Color/scalable/gimp-controller-midi.svg      |  220 +-
 icons/Color/scalable/gimp-convert-grayscale.svg    |  215 +-
 icons/Color/scalable/gimp-convert-indexed.svg      |  298 +-
 icons/Color/scalable/gimp-convert-rgb.svg          |  346 +-
 icons/Color/scalable/gimp-cursor.svg               |  148 +-
 icons/Color/scalable/gimp-curve-free.svg           |  148 +-
 icons/Color/scalable/gimp-curve-smooth.svg         |  130 +-
 icons/Color/scalable/gimp-device-status.svg        |  362 +-
 .../scalable/gimp-display-filter-colorblind.svg    |  325 +-
 .../scalable/gimp-display-filter-contrast.svg      |  233 +-
 icons/Color/scalable/gimp-display-filter-gamma.svg |  411 +-
 icons/Color/scalable/gimp-display-filter-lcms.svg  |  269 +-
 icons/Color/scalable/gimp-display-filter-proof.svg |  412 +-
 icons/Color/scalable/gimp-duplicate.svg            |  168 +-
 icons/Color/scalable/gimp-dynamics.svg             |  158 +-
 icons/Color/scalable/gimp-edit.svg                 |  725 +-
 icons/Color/scalable/gimp-error.svg                |  282 +-
 icons/Color/scalable/gimp-flip-horizontal.svg      |  178 +-
 icons/Color/scalable/gimp-flip-vertical.svg        |  177 +-
 icons/Color/scalable/gimp-floating-selection.svg   |  301 +-
 icons/Color/scalable/gimp-gradient-bilinear.svg    |  236 +-
 .../scalable/gimp-gradient-conical-asymmetric.svg  |  258 +-
 .../scalable/gimp-gradient-conical-symmetric.svg   |  267 +-
 icons/Color/scalable/gimp-gradient-linear.svg      |  225 +-
 icons/Color/scalable/gimp-gradient-radial.svg      |  225 +-
 .../scalable/gimp-gradient-shapeburst-angular.svg  |  257 +-
 .../scalable/gimp-gradient-shapeburst-dimpled.svg  |  205 +-
 .../gimp-gradient-shapeburst-spherical.svg         |  210 +-
 .../gimp-gradient-spiral-anticlockwise.svg         |  192 +-
 .../scalable/gimp-gradient-spiral-clockwise.svg    |  191 +-
 icons/Color/scalable/gimp-gradient-square.svg      |  215 +-
 icons/Color/scalable/gimp-gravity-east.svg         |  181 +-
 icons/Color/scalable/gimp-gravity-north-east.svg   |  165 +-
 icons/Color/scalable/gimp-gravity-north-west.svg   |  182 +-
 icons/Color/scalable/gimp-gravity-north.svg        |  178 +-
 icons/Color/scalable/gimp-gravity-south-east.svg   |  180 +-
 icons/Color/scalable/gimp-gravity-south-west.svg   |  180 +-
 icons/Color/scalable/gimp-gravity-south.svg        |  181 +-
 icons/Color/scalable/gimp-gravity-west.svg         |  181 +-
 icons/Color/scalable/gimp-hcenter.svg              |  190 +-
 icons/Color/scalable/gimp-hchain-broken.svg        |  309 +-
 icons/Color/scalable/gimp-hchain.svg               |  289 +-
 icons/Color/scalable/gimp-hfill.svg                |  197 +-
 icons/Color/scalable/gimp-histogram-linear.svg     |  175 +-
 .../Color/scalable/gimp-histogram-logarithmic.svg  |  199 +-
 icons/Color/scalable/gimp-histogram.svg            |  138 +-
 icons/Color/scalable/gimp-image.svg                |  367 +-
 icons/Color/scalable/gimp-images.svg               |  428 +-
 icons/Color/scalable/gimp-info.svg                 |  805 +-
 icons/Color/scalable/gimp-input-device.svg         |  511 +-
 icons/Color/scalable/gimp-invert.svg               |  162 +-
 icons/Color/scalable/gimp-join-bevel.svg           |  276 +-
 icons/Color/scalable/gimp-join-miter.svg           |  264 +-
 icons/Color/scalable/gimp-join-round.svg           |  455 +-
 icons/Color/scalable/gimp-landscape.svg            |  289 +-
 icons/Color/scalable/gimp-layer-mask.svg           |  302 +-
 icons/Color/scalable/gimp-layer-to-imagesize.svg   |  405 +-
 icons/Color/scalable/gimp-layer.svg                |  110 +-
 icons/Color/scalable/gimp-layers.svg               |  349 +-
 icons/Color/scalable/gimp-letter-spacing.svg       |  241 +-
 icons/Color/scalable/gimp-line-spacing.svg         |  249 +-
 icons/Color/scalable/gimp-linked.svg               |  780 +-
 icons/Color/scalable/gimp-list.svg                 |  222 +-
 icons/Color/scalable/gimp-menu-left.svg            |  158 +-
 icons/Color/scalable/gimp-menu-right.svg           |  155 +-
 icons/Color/scalable/gimp-merge-down.svg           |  183 +-
 icons/Color/scalable/gimp-move-to-screen.svg       |  348 +-
 icons/Color/scalable/gimp-paste-as-new.svg         |  604 +-
 icons/Color/scalable/gimp-paste-into.svg           |  967 +-
 icons/Color/scalable/gimp-path-stroke.svg          |  297 +-
 icons/Color/scalable/gimp-path.svg                 |  183 +-
 icons/Color/scalable/gimp-paths.svg                |  214 +-
 icons/Color/scalable/gimp-plugin.svg               |  252 +-
 icons/Color/scalable/gimp-portrait.svg             |  280 +-
 icons/Color/scalable/gimp-prefs-default-grid.svg   | 1208 +-
 icons/Color/scalable/gimp-prefs-help-system.svg    |  597 +-
 icons/Color/scalable/gimp-question.svg             |  203 +-
 icons/Color/scalable/gimp-quick-mask-off.svg       |  267 +-
 icons/Color/scalable/gimp-quick-mask-on.svg        |  142 +-
 icons/Color/scalable/gimp-reset.svg                |  318 +-
 icons/Color/scalable/gimp-reshow-filter.svg        |  207 +-
 icons/Color/scalable/gimp-resize.svg               |  220 +-
 icons/Color/scalable/gimp-rotate-180.svg           |  144 +-
 icons/Color/scalable/gimp-rotate-270.svg           |  144 +-
 icons/Color/scalable/gimp-rotate-90.svg            |  142 +-
 icons/Color/scalable/gimp-sample-point.svg         |  141 +-
 icons/Color/scalable/gimp-scale.svg                |  221 +-
 icons/Color/scalable/gimp-selection-add.svg        |  529 +-
 icons/Color/scalable/gimp-selection-all.svg        |  548 +-
 icons/Color/scalable/gimp-selection-border.svg     |  501 +-
 icons/Color/scalable/gimp-selection-grow.svg       |  618 +-
 icons/Color/scalable/gimp-selection-intersect.svg  |  538 +-
 icons/Color/scalable/gimp-selection-none.svg       |  563 +-
 icons/Color/scalable/gimp-selection-replace.svg    |  682 +-
 icons/Color/scalable/gimp-selection-shrink.svg     |  508 +-
 icons/Color/scalable/gimp-selection-stroke.svg     |  668 +-
 icons/Color/scalable/gimp-selection-subtract.svg   |  525 +-
 icons/Color/scalable/gimp-selection-to-channel.svg |  802 +-
 icons/Color/scalable/gimp-selection-to-path.svg    |  635 +-
 icons/Color/scalable/gimp-selection.svg            |  525 +-
 icons/Color/scalable/gimp-swap-colors.svg          |  179 +-
 icons/Color/scalable/gimp-symmetry.svg             |  191 +
 icons/Color/scalable/gimp-text-dir-ltr.svg         |  211 +-
 icons/Color/scalable/gimp-text-dir-rtl.svg         |  243 +-
 icons/Color/scalable/gimp-text-layer.svg           |  170 +-
 icons/Color/scalable/gimp-tool-airbrush.svg        |  367 +-
 icons/Color/scalable/gimp-tool-align.svg           |  326 +-
 icons/Color/scalable/gimp-tool-blend.svg           |  209 +-
 icons/Color/scalable/gimp-tool-blur.svg            |  246 +-
 .../scalable/gimp-tool-brightness-contrast.svg     |  256 +-
 icons/Color/scalable/gimp-tool-bucket-fill.svg     |  277 +-
 icons/Color/scalable/gimp-tool-by-color-select.svg |  667 +-
 icons/Color/scalable/gimp-tool-cage.svg            |  508 +-
 icons/Color/scalable/gimp-tool-clone.svg           |  375 +-
 icons/Color/scalable/gimp-tool-color-balance.svg   |  359 +-
 icons/Color/scalable/gimp-tool-color-picker.svg    |  292 +-
 icons/Color/scalable/gimp-tool-colorize.svg        |  320 +-
 icons/Color/scalable/gimp-tool-crop.svg            |  384 +-
 icons/Color/scalable/gimp-tool-curves.svg          |  683 +-
 icons/Color/scalable/gimp-tool-desaturate.svg      |  244 +-
 icons/Color/scalable/gimp-tool-dodge.svg           |  325 +-
 icons/Color/scalable/gimp-tool-ellipse-select.svg  |  463 +-
 icons/Color/scalable/gimp-tool-eraser.svg          |  218 +-
 icons/Color/scalable/gimp-tool-flip.svg            |  272 +-
 .../Color/scalable/gimp-tool-foreground-select.svg |  689 +-
 icons/Color/scalable/gimp-tool-free-select.svg     |  438 +-
 icons/Color/scalable/gimp-tool-fuzzy-select.svg    |  339 +-
 .../Color/scalable/gimp-tool-handle-transform.svg  |  445 +-
 icons/Color/scalable/gimp-tool-heal.svg            |  297 +-
 icons/Color/scalable/gimp-tool-hue-saturation.svg  |  288 +-
 icons/Color/scalable/gimp-tool-ink.svg             |  291 +-
 icons/Color/scalable/gimp-tool-iscissors.svg       |  518 +-
 icons/Color/scalable/gimp-tool-levels.svg          |  307 +-
 icons/Color/scalable/gimp-tool-measure.svg         |  164 +-
 icons/Color/scalable/gimp-tool-move.svg            |  275 +-
 icons/Color/scalable/gimp-tool-mypaint-brush.svg   |  342 +-
 .../scalable/gimp-tool-n-point-deformation.svg     |  349 +-
 icons/Color/scalable/gimp-tool-options.svg         |  253 +-
 icons/Color/scalable/gimp-tool-paintbrush.svg      |  337 +-
 icons/Color/scalable/gimp-tool-path.svg            |  356 +-
 icons/Color/scalable/gimp-tool-pencil.svg          |  373 +-
 .../Color/scalable/gimp-tool-perspective-clone.svg |  403 +-
 icons/Color/scalable/gimp-tool-perspective.svg     |  266 +-
 icons/Color/scalable/gimp-tool-posterize.svg       |  197 +-
 icons/Color/scalable/gimp-tool-preset.svg          | 1127 +-
 icons/Color/scalable/gimp-tool-rect-select.svg     |  567 +-
 icons/Color/scalable/gimp-tool-rotate.svg          |  282 +-
 icons/Color/scalable/gimp-tool-scale.svg           |  457 +-
 icons/Color/scalable/gimp-tool-seamless-clone.svg  |  515 +-
 icons/Color/scalable/gimp-tool-shear.svg           |  251 +-
 icons/Color/scalable/gimp-tool-smudge.svg          |  313 +-
 icons/Color/scalable/gimp-tool-text.svg            |  284 +-
 icons/Color/scalable/gimp-tool-threshold.svg       |  299 +-
 .../Color/scalable/gimp-tool-unified-transform.svg |  287 +-
 icons/Color/scalable/gimp-tool-warp.svg            |  249 +-
 icons/Color/scalable/gimp-tool-zoom.svg            |  323 +-
 icons/Color/scalable/gimp-tools.svg                |  695 +-
 icons/Color/scalable/gimp-vcenter.svg              |  189 +-
 icons/Color/scalable/gimp-vchain-broken.svg        |  308 +-
 icons/Color/scalable/gimp-vchain.svg               |  284 +-
 icons/Color/scalable/gimp-vfill.svg                |  192 +-
 icons/Color/scalable/gimp-visible.svg              |  208 +-
 icons/Color/scalable/gimp-warning.svg              |   76 +-
 icons/Color/scalable/gimp-web.svg                  | 1430 +-
 icons/Color/scalable/gimp-zoom-follow-window.svg   |  272 +-
 icons/Legacy/Makefile.am                           |   18 +-
 icons/Legacy/index.theme                           |    7 +-
 icons/Prototype/Color/16/gimp-add.png              |  Bin 0 -> 597 bytes
 icons/Prototype/Color/16/gimp-align-block.png      |  Bin 0 -> 467 bytes
 icons/Prototype/Color/16/gimp-align-center.png     |  Bin 0 -> 465 bytes
 icons/Prototype/Color/16/gimp-align-left.png       |  Bin 0 -> 455 bytes
 icons/Prototype/Color/16/gimp-align-right.png      |  Bin 0 -> 456 bytes
 icons/Prototype/Color/16/gimp-bottom.png           |  Bin 0 -> 634 bytes
 icons/Prototype/Color/16/gimp-channel-delete.png   |  Bin 0 -> 911 bytes
 icons/Prototype/Color/16/gimp-channel-down.png     |  Bin 0 -> 877 bytes
 icons/Prototype/Color/16/gimp-channel-edit.png     |  Bin 0 -> 999 bytes
 icons/Prototype/Color/16/gimp-channel-new.png      |  Bin 0 -> 845 bytes
 icons/Prototype/Color/16/gimp-channel-up.png       |  Bin 0 -> 867 bytes
 icons/Prototype/Color/16/gimp-clean.png            |  Bin 0 -> 699 bytes
 icons/Prototype/Color/16/gimp-cmyk.png             |  Bin 0 -> 778 bytes
 icons/Prototype/Color/16/gimp-color-palette.png    |  Bin 0 -> 980 bytes
 icons/Prototype/Color/16/gimp-configure.png        |  Bin 0 -> 948 bytes
 icons/Prototype/Color/16/gimp-cut.png              |  Bin 0 -> 993 bytes
 icons/Prototype/Color/16/gimp-delete.png           |  Bin 0 -> 832 bytes
 icons/Prototype/Color/16/gimp-document-index.png   |  Bin 0 -> 838 bytes
 icons/Prototype/Color/16/gimp-down.png             |  Bin 0 -> 575 bytes
 icons/Prototype/Color/16/gimp-edit-common.png      |  Bin 0 -> 676 bytes
 icons/Prototype/Color/16/gimp-file-open.png        |  Bin 0 -> 772 bytes
 icons/Prototype/Color/16/gimp-folder-open.png      |  Bin 0 -> 652 bytes
 icons/Prototype/Color/16/gimp-fonts.png            |  Bin 0 -> 883 bytes
 .../Color/16/gimp-image-fit-to-window.png          |  Bin 0 -> 833 bytes
 icons/Prototype/Color/16/gimp-image-open.png       |  Bin 0 -> 855 bytes
 icons/Prototype/Color/16/gimp-image-property.png   |  Bin 0 -> 825 bytes
 icons/Prototype/Color/16/gimp-increment-intend.png |  Bin 0 -> 629 bytes
 icons/Prototype/Color/16/gimp-information.png      |  Bin 0 -> 1078 bytes
 icons/Prototype/Color/16/gimp-layer-delete.png     |  Bin 0 -> 744 bytes
 icons/Prototype/Color/16/gimp-layer-down.png       |  Bin 0 -> 932 bytes
 icons/Prototype/Color/16/gimp-layer-new.png        |  Bin 0 -> 778 bytes
 icons/Prototype/Color/16/gimp-layer-newgroup.png   |  Bin 0 -> 840 bytes
 icons/Prototype/Color/16/gimp-layer-up.png         |  Bin 0 -> 929 bytes
 icons/Prototype/Color/16/gimp-left.png             |  Bin 0 -> 598 bytes
 icons/Prototype/Color/16/gimp-new-unit.png         |  Bin 0 -> 866 bytes
 icons/Prototype/Color/16/gimp-okay.png             |  Bin 0 -> 861 bytes
 icons/Prototype/Color/16/gimp-one-to-one.png       |  Bin 0 -> 942 bytes
 icons/Prototype/Color/16/gimp-path-delete.png      |  Bin 0 -> 866 bytes
 icons/Prototype/Color/16/gimp-path-down.png        |  Bin 0 -> 886 bytes
 icons/Prototype/Color/16/gimp-path-new.png         |  Bin 0 -> 872 bytes
 icons/Prototype/Color/16/gimp-path-up.png          |  Bin 0 -> 848 bytes
 icons/Prototype/Color/16/gimp-refresh.png          |  Bin 0 -> 928 bytes
 icons/Prototype/Color/16/gimp-remove.png           |  Bin 0 -> 373 bytes
 icons/Prototype/Color/16/gimp-restore.png          |  Bin 0 -> 642 bytes
 icons/Prototype/Color/16/gimp-revoke.png           |  Bin 0 -> 646 bytes
 icons/Prototype/Color/16/gimp-right.png            |  Bin 0 -> 598 bytes
 icons/Prototype/Color/16/gimp-save.png             |  Bin 0 -> 815 bytes
 icons/Prototype/Color/16/gimp-script.png           |  Bin 0 -> 613 bytes
 icons/Prototype/Color/16/gimp-search.png           |  Bin 0 -> 958 bytes
 icons/Prototype/Color/16/gimp-set-scale.png        |  Bin 0 -> 978 bytes
 icons/Prototype/Color/16/gimp-shred.png            |  Bin 0 -> 921 bytes
 icons/Prototype/Color/16/gimp-template-a3.png      |  Bin 0 -> 757 bytes
 icons/Prototype/Color/16/gimp-template-a4.png      |  Bin 0 -> 735 bytes
 icons/Prototype/Color/16/gimp-template-a5.png      |  Bin 0 -> 761 bytes
 icons/Prototype/Color/16/gimp-template-b4.png      |  Bin 0 -> 762 bytes
 icons/Prototype/Color/16/gimp-template-b5.png      |  Bin 0 -> 765 bytes
 .../Prototype/Color/16/gimp-template-cd-label.png  |  Bin 0 -> 1055 bytes
 .../Color/16/gimp-template-floppy-label.png        |  Bin 0 -> 782 bytes
 icons/Prototype/Color/16/gimp-template-us.png      |  Bin 0 -> 743 bytes
 .../Color/16/gimp-tool-options-delete.png          |  Bin 0 -> 902 bytes
 .../Color/16/gimp-tool-options-restore.png         |  Bin 0 -> 865 bytes
 .../Prototype/Color/16/gimp-tool-options-save.png  |  Bin 0 -> 861 bytes
 icons/Prototype/Color/16/gimp-up.png               |  Bin 0 -> 579 bytes
 icons/Prototype/Color/16/gimp-water-color.png      |  Bin 0 -> 972 bytes
 .../Color/16/gimp-window-fit-to-image.png          |  Bin 0 -> 960 bytes
 .../Prototype/Color/16/gimp-window-fit-to-size.png |  Bin 0 -> 874 bytes
 icons/Prototype/Symbolic/16/gimp-add.png           |  Bin 0 -> 539 bytes
 icons/Prototype/Symbolic/16/gimp-align-block.png   |  Bin 0 -> 371 bytes
 icons/Prototype/Symbolic/16/gimp-align-center.png  |  Bin 0 -> 425 bytes
 icons/Prototype/Symbolic/16/gimp-align-left.png    |  Bin 0 -> 447 bytes
 icons/Prototype/Symbolic/16/gimp-align-right.png   |  Bin 0 -> 423 bytes
 icons/Prototype/Symbolic/16/gimp-bottom.png        |  Bin 0 -> 521 bytes
 .../Prototype/Symbolic/16/gimp-channel-delete.png  |  Bin 0 -> 677 bytes
 icons/Prototype/Symbolic/16/gimp-channel-down.png  |  Bin 0 -> 578 bytes
 icons/Prototype/Symbolic/16/gimp-channel-edit.png  |  Bin 0 -> 615 bytes
 icons/Prototype/Symbolic/16/gimp-channel-new.png   |  Bin 0 -> 469 bytes
 icons/Prototype/Symbolic/16/gimp-channel-up.png    |  Bin 0 -> 570 bytes
 icons/Prototype/Symbolic/16/gimp-clean.png         |  Bin 0 -> 666 bytes
 icons/Prototype/Symbolic/16/gimp-cmyk.png          |  Bin 0 -> 721 bytes
 icons/Prototype/Symbolic/16/gimp-color-palette.png |  Bin 0 -> 792 bytes
 icons/Prototype/Symbolic/16/gimp-configure.png     |  Bin 0 -> 859 bytes
 icons/Prototype/Symbolic/16/gimp-cut.png           |  Bin 0 -> 786 bytes
 icons/Prototype/Symbolic/16/gimp-delete.png        |  Bin 0 -> 875 bytes
 .../Prototype/Symbolic/16/gimp-document-index.png  |  Bin 0 -> 621 bytes
 icons/Prototype/Symbolic/16/gimp-down.png          |  Bin 0 -> 539 bytes
 icons/Prototype/Symbolic/16/gimp-edit-common.png   |  Bin 0 -> 626 bytes
 icons/Prototype/Symbolic/16/gimp-file-open.png     |  Bin 0 -> 614 bytes
 icons/Prototype/Symbolic/16/gimp-folder-open.png   |  Bin 0 -> 491 bytes
 icons/Prototype/Symbolic/16/gimp-fonts.png         |  Bin 0 -> 634 bytes
 .../Symbolic/16/gimp-image-fit-to-window.png       |  Bin 0 -> 710 bytes
 icons/Prototype/Symbolic/16/gimp-image-open.png    |  Bin 0 -> 668 bytes
 .../Prototype/Symbolic/16/gimp-image-property.png  |  Bin 0 -> 717 bytes
 icons/Prototype/Symbolic/16/gimp-information.png   |  Bin 0 -> 785 bytes
 icons/Prototype/Symbolic/16/gimp-layer-delete.png  |  Bin 0 -> 683 bytes
 icons/Prototype/Symbolic/16/gimp-layer-down.png    |  Bin 0 -> 661 bytes
 icons/Prototype/Symbolic/16/gimp-layer-new.png     |  Bin 0 -> 593 bytes
 .../Prototype/Symbolic/16/gimp-layer-newgroup.png  |  Bin 0 -> 401 bytes
 icons/Prototype/Symbolic/16/gimp-layer-up.png      |  Bin 0 -> 642 bytes
 icons/Prototype/Symbolic/16/gimp-left.png          |  Bin 0 -> 549 bytes
 icons/Prototype/Symbolic/16/gimp-new-unit.png      |  Bin 0 -> 791 bytes
 icons/Prototype/Symbolic/16/gimp-okay.png          |  Bin 0 -> 708 bytes
 icons/Prototype/Symbolic/16/gimp-one-to-one.png    |  Bin 0 -> 674 bytes
 icons/Prototype/Symbolic/16/gimp-path-delete.png   |  Bin 0 -> 747 bytes
 icons/Prototype/Symbolic/16/gimp-path-down.png     |  Bin 0 -> 858 bytes
 icons/Prototype/Symbolic/16/gimp-path-new.png      |  Bin 0 -> 698 bytes
 icons/Prototype/Symbolic/16/gimp-path-up.png       |  Bin 0 -> 839 bytes
 .../16/gimp-prefs-folders-mypaint-brushes.png      |  Bin 0 -> 668 bytes
 .../16/gimp-prefs-image-window-appearance.png      |  Bin 0 -> 730 bytes
 .../16/gimp-prefs-image-window-snapping.png        |  Bin 0 -> 664 bytes
 icons/Prototype/Symbolic/16/gimp-refresh.png       |  Bin 0 -> 766 bytes
 icons/Prototype/Symbolic/16/gimp-remove.png        |  Bin 0 -> 390 bytes
 icons/Prototype/Symbolic/16/gimp-restore.png       |  Bin 0 -> 578 bytes
 icons/Prototype/Symbolic/16/gimp-revoke.png        |  Bin 0 -> 573 bytes
 icons/Prototype/Symbolic/16/gimp-right.png         |  Bin 0 -> 541 bytes
 icons/Prototype/Symbolic/16/gimp-save.png          |  Bin 0 -> 469 bytes
 icons/Prototype/Symbolic/16/gimp-script.png        |  Bin 0 -> 668 bytes
 icons/Prototype/Symbolic/16/gimp-search.png        |  Bin 0 -> 688 bytes
 icons/Prototype/Symbolic/16/gimp-set-scale.png     |  Bin 0 -> 714 bytes
 icons/Prototype/Symbolic/16/gimp-shred.png         |  Bin 0 -> 753 bytes
 icons/Prototype/Symbolic/16/gimp-template-a3.png   |  Bin 0 -> 591 bytes
 icons/Prototype/Symbolic/16/gimp-template-a4.png   |  Bin 0 -> 564 bytes
 icons/Prototype/Symbolic/16/gimp-template-a5.png   |  Bin 0 -> 585 bytes
 icons/Prototype/Symbolic/16/gimp-template-a6.png   |  Bin 0 -> 592 bytes
 icons/Prototype/Symbolic/16/gimp-template-b4.png   |  Bin 0 -> 599 bytes
 icons/Prototype/Symbolic/16/gimp-template-b5.png   |  Bin 0 -> 607 bytes
 .../Symbolic/16/gimp-template-cd-label.png         |  Bin 0 -> 743 bytes
 .../Symbolic/16/gimp-template-floppy-label.png     |  Bin 0 -> 680 bytes
 icons/Prototype/Symbolic/16/gimp-template-us.png   |  Bin 0 -> 625 bytes
 .../Symbolic/16/gimp-tool-options-delete.png       |  Bin 0 -> 711 bytes
 .../Symbolic/16/gimp-tool-options-restore.png      |  Bin 0 -> 690 bytes
 .../Symbolic/16/gimp-tool-options-save.png         |  Bin 0 -> 668 bytes
 .../Symbolic/16/gimp-tool-restore-preset.png       |  Bin 0 -> 682 bytes
 icons/Prototype/Symbolic/16/gimp-unvisible.png     |  Bin 0 -> 694 bytes
 icons/Prototype/Symbolic/16/gimp-up.png            |  Bin 0 -> 516 bytes
 icons/Prototype/Symbolic/16/gimp-water-color.png   |  Bin 0 -> 1008 bytes
 .../Symbolic/16/gimp-window-fit-to-image.png       |  Bin 0 -> 726 bytes
 .../Symbolic/16/gimp-window-fit-to-size.png        |  Bin 0 -> 709 bytes
 icons/Symbolic-Inverted/Makefile.am                |    4 +
 icons/Symbolic/16/gimp-flip-horizontal.png         |  Bin 440 -> 464 bytes
 icons/Symbolic/16/gimp-flip-vertical.png           |  Bin 384 -> 426 bytes
 icons/Symbolic/16/gimp-tool-rotate.png             |  Bin 507 -> 653 bytes
 icons/Symbolic/16/gimp-tool-scale.png              |  Bin 324 -> 387 bytes
 icons/Symbolic/22/gimp-gegl.png                    |  Bin 778 -> 0 bytes
 icons/Symbolic/22/gimp-tool-preset.png             |  Bin 0 -> 883 bytes
 icons/Symbolic/22/gimp-tool-zoom.png               |  Bin 744 -> 0 bytes
 icons/Symbolic/24/gimp-gegl.png                    |  Bin 0 -> 915 bytes
 .../gimp-tool-flip-24.svg => 24/gimp-gegl.svg}     |   66 +-
 .../gimp-tool-airbrush.svg}                        |    0
 .../gimp-tool-align.svg}                           |    0
 .../gimp-tool-blend.svg}                           |    0
 .../gimp-tool-blur.svg}                            |   59 +-
 .../gimp-tool-brightness-contrast.svg}             |    0
 .../gimp-tool-bucket-fill.svg}                     |    0
 .../gimp-tool-by-color-select.svg}                 |    0
 .../gimp-tool-cage.svg}                            |    0
 .../gimp-tool-clone.svg}                           |    0
 .../gimp-tool-color-balance.svg}                   |    0
 .../gimp-tool-color-picker.svg}                    |    0
 .../gimp-tool-colorize.svg}                        |    0
 .../gimp-tool-crop.svg}                            |    0
 .../gimp-tool-curves.svg}                          |    0
 .../gimp-tool-desaturate.svg}                      |    0
 .../gimp-tool-dodge.svg}                           |    0
 .../gimp-tool-ellipse-select.svg}                  |    0
 .../gimp-tool-eraser.svg}                          |    0
 .../gimp-tool-flip.svg}                            |    0
 .../gimp-tool-foreground-select.svg}               |  342 +-
 .../gimp-tool-free-select.svg}                     |    0
 .../gimp-tool-fuzzy-select.svg}                    |    0
 .../gimp-tool-handle-transform.svg}                |    0
 .../gimp-tool-heal.svg}                            |    0
 .../gimp-tool-hue-saturation.svg}                  |    0
 .../gimp-tool-ink-24.svg => 24/gimp-tool-ink.svg}  |    0
 .../gimp-tool-iscissors.svg}                       |    0
 .../gimp-tool-levels.svg}                          |    0
 .../gimp-tool-measure.svg}                         |    0
 .../gimp-tool-move.svg}                            |    0
 .../gimp-tool-mypaint-brush.svg}                   |    0
 .../gimp-tool-n-point-deformation.svg}             |    0
 .../gimp-tool-paintbrush.svg}                      |    0
 .../gimp-tool-path.svg}                            |    0
 .../gimp-tool-pencil.svg}                          |    0
 .../gimp-tool-perspective-clone.svg}               |    0
 .../gimp-tool-perspective.svg}                     |    0
 icons/Symbolic/24/gimp-tool-posterize.svg          |  322 +
 .../gimp-tool-rect-select.svg}                     |   15 +-
 icons/Symbolic/24/gimp-tool-rotate.png             |  Bin 766 -> 824 bytes
 icons/Symbolic/24/gimp-tool-rotate.svg             |  149 +
 icons/Symbolic/24/gimp-tool-scale.png              |  Bin 556 -> 554 bytes
 .../gimp-tool-scale.svg}                           |   16 +-
 .../gimp-tool-seamless-clone.svg}                  |    0
 .../gimp-tool-shear.svg}                           |    0
 .../gimp-tool-smudge.svg}                          |    0
 .../gimp-tool-text.svg}                            |    0
 .../gimp-tool-threshold.svg}                       |    0
 .../gimp-tool-unified-transform.svg}               |    0
 .../gimp-tool-warp.svg}                            |    0
 .../gimp-tool-zoom.svg}                            |    0
 icons/Symbolic/scalable/gimp-channel-indexed.svg   |   49 +-
 .../Symbolic/scalable/gimp-controller-keyboard.svg |   47 +-
 icons/Symbolic/scalable/gimp-convert-indexed.svg   |   41 +-
 icons/Symbolic/scalable/gimp-flip-horizontal.svg   |  474 +-
 icons/Symbolic/scalable/gimp-flip-vertical.svg     |  497 +-
 icons/Symbolic/scalable/gimp-gradient-bilinear.svg |   49 +-
 icons/Symbolic/scalable/gimp-gradient-linear.svg   |   49 +-
 .../gimp-gradient-shapeburst-spherical.svg         |   49 +-
 icons/Symbolic/scalable/gimp-paste-into.svg        |   47 +-
 .../scalable/gimp-prefs-system-resources.svg       |   47 +-
 icons/Symbolic/scalable/gimp-prefs-toolbox.svg     |   47 +-
 icons/Symbolic/scalable/gimp-quick-mask-off.svg    |   47 +-
 icons/Symbolic/scalable/gimp-scale.svg             |   49 +-
 icons/Symbolic/scalable/gimp-selection-add.svg     |   49 +-
 .../Symbolic/scalable/gimp-selection-intersect.svg |   49 +-
 icons/Symbolic/scalable/gimp-selection-replace.svg |   47 +-
 icons/Symbolic/scalable/gimp-selection-shrink.svg  |   49 +-
 icons/Symbolic/scalable/gimp-selection-stroke.svg  |   49 +-
 .../Symbolic/scalable/gimp-selection-subtract.svg  |   49 +-
 icons/Symbolic/scalable/gimp-selection-to-path.svg |   47 +-
 icons/Symbolic/scalable/gimp-selection.svg         |   47 +-
 icons/Symbolic/scalable/gimp-shape-circle.svg      |   47 +-
 icons/Symbolic/scalable/gimp-shape-diamond.svg     |   49 +-
 icons/Symbolic/scalable/gimp-shape-square.svg      |   47 +-
 icons/Symbolic/scalable/gimp-swap-colors.svg       |   49 +-
 icons/Symbolic/scalable/gimp-symmetry.svg          |  150 +
 icons/Symbolic/scalable/gimp-template.svg          |   47 +-
 icons/Symbolic/scalable/gimp-text-dir-ltr.svg      |   49 +-
 icons/Symbolic/scalable/gimp-text-dir-rtl.svg      |   49 +-
 icons/Symbolic/scalable/gimp-tool-blur-24.svg      |  476 -
 icons/Symbolic/scalable/gimp-tool-bucket-fill.svg  |   47 +-
 icons/Symbolic/scalable/gimp-tool-cage.svg         |   47 +-
 .../scalable/gimp-tool-foreground-select.svg       |   53 +-
 .../scalable/gimp-tool-handle-transform.svg        |   47 +-
 icons/Symbolic/scalable/gimp-tool-iscissors.svg    |   47 +-
 icons/Symbolic/scalable/gimp-tool-posterize-24.svg |  662 -
 icons/Symbolic/scalable/gimp-tool-rect-select.svg  |   51 +-
 icons/Symbolic/scalable/gimp-tool-rotate-24.svg    |  161 -
 icons/Symbolic/scalable/gimp-tool-rotate.svg       |  261 +-
 icons/Symbolic/scalable/gimp-tool-scale.svg        |   14 +-
 icons/Symbolic/scalable/gimp-transparency.svg      |   47 +-
 icons/Symbolic/scalable/gimp-web.svg               |   49 +-
 icons/Symbolic/symbolic-scalable.svg               | 1852 +-
 icons/icon-list.mk                                 |  156 +-
 libgimp/gimpenums.h                                |    3 +-
 libgimp/gimpfonts_pdb.c                            |    3 +-
 libgimp/gimpimageconvert_pdb.c                     |    7 +-
 libgimp/gimpselection_pdb.c                        |   10 +-
 libgimp/gimptilebackendplugin.c                    |    2 +-
 libgimpbase/gimpmetadata.c                         |   11 +-
 libgimpcolor/gimpcolor.def                         |    9 +-
 libgimpcolor/gimpcolorprofile.c                    |  123 +-
 libgimpcolor/gimpcolorprofile.h                    |    9 +-
 libgimpconfig/gimpcolorconfig.c                    |  165 +-
 libgimpconfig/gimpconfig-params.h                  |    4 +
 menus/image-menu.xml.in                            |    1 +
 modules/display-filter-color-blind.c               |   12 +-
 modules/display-filter-gamma.c                     |   10 +-
 modules/display-filter-high-contrast.c             |   10 +-
 modules/display-filter-proof.c                     |   34 +-
 modules/gimpcolorwheel.c                           |    9 +-
 plug-ins/Makefile.am                               |    6 +-
 plug-ins/common/cml-explorer.c                     |   31 +-
 plug-ins/common/curve-bend.c                       |   15 +-
 plug-ins/common/edge-dog.c                         |   46 +-
 plug-ins/common/edge-neon.c                        |   24 +-
 plug-ins/common/emboss.c                           |   10 +-
 plug-ins/common/file-csource.c                     |    6 +-
 plug-ins/common/file-gegl.c                        |   13 -
 plug-ins/common/file-gif-save.c                    |  936 +-
 plug-ins/common/file-pnm.c                         |    2 +
 plug-ins/common/fractal-trace.c                    |   20 +-
 plug-ins/common/grid.c                             |   12 +-
 plug-ins/common/hot.c                              |    9 +-
 plug-ins/common/newsprint.c                        |    9 +-
 plug-ins/common/nl-filter.c                        |   11 +-
 plug-ins/common/oilify.c                           |    9 +-
 plug-ins/common/qbist.c                            |   27 +-
 plug-ins/common/sample-colorize.c                  |    9 +-
 plug-ins/common/smooth-palette.c                   |   11 +-
 plug-ins/common/softglow.c                         |   15 +-
 plug-ins/common/sparkle.c                          |   28 +-
 plug-ins/common/sphere-designer.c                  |   36 +-
 plug-ins/common/unsharp-mask.c                     |   11 +-
 plug-ins/common/van-gogh-lic.c                     |   25 +-
 plug-ins/file-bmp/Makefile.am                      |    6 +-
 plug-ins/file-bmp/{bmp-read.c => bmp-load.c}       |  522 +-
 .../file-bmp/bmp-load.h                            |   15 +-
 plug-ins/file-bmp/{bmp-write.c => bmp-save.c}      |  323 +-
 .../file-bmp/bmp-save.h                            |   18 +-
 plug-ins/file-bmp/bmp.c                            |   69 +-
 plug-ins/file-bmp/bmp.h                            |   56 +-
 plug-ins/file-darktable/.gitignore                 |    7 +
 plug-ins/file-darktable/Makefile.am                |   45 +
 plug-ins/file-darktable/export-on-exit.lua         |   66 +
 plug-ins/file-darktable/file-darktable.c           |  464 +
 plug-ins/file-darktable/get-size.lua               |   21 +
 plug-ins/file-exr/Makefile.am                      |    1 +
 plug-ins/file-exr/exr-attribute-blob.h             |   94 +
 plug-ins/file-exr/file-exr.c                       |  197 +-
 plug-ins/file-exr/openexr-wrapper.cc               |  139 +-
 plug-ins/file-exr/openexr-wrapper.h                |   15 +-
 plug-ins/file-tiff/file-tiff-io.c                  |  367 +-
 plug-ins/file-tiff/file-tiff-io.h                  |    2 +-
 plug-ins/file-tiff/file-tiff-load.c                |   24 +-
 plug-ins/file-tiff/file-tiff-load.h                |    2 +-
 plug-ins/file-tiff/file-tiff-save.c                |   15 +-
 plug-ins/file-tiff/file-tiff-save.h                |    2 +-
 plug-ins/file-tiff/file-tiff.c                     |   30 +-
 plug-ins/fractal-explorer/fractal-explorer.c       |   27 +-
 plug-ins/gfig/gfig.c                               |   14 +-
 plug-ins/gimpressionist/brush.c                    |   24 +-
 plug-ins/gimpressionist/gimp.c                     |    2 +
 plug-ins/gradient-flare/gradient-flare.c           |   26 +-
 plug-ins/lighting/lighting-image.c                 |   13 +-
 plug-ins/lighting/lighting-main.c                  |    8 +-
 plug-ins/lighting/lighting-ui.c                    |    5 +-
 plug-ins/map-object/map-object-image.c             |    9 +-
 plug-ins/map-object/map-object-main.c              |   10 +-
 plug-ins/map-object/map-object-preview.c           |    3 +
 plug-ins/pagecurl/Makefile.am                      |    1 +
 plug-ins/pagecurl/pagecurl.c                       |  532 +-
 plug-ins/pygimp/gimpmodule.c                       |    7 +-
 plug-ins/pygimp/plug-ins/pyconsole.py              |  101 +-
 plug-ins/pygimp/plug-ins/python-console.py         |    8 +-
 plug-ins/pygimp/pygimp-drawable.c                  |   18 +-
 plug-ins/twain/Makefile.am                         |   12 +-
 plug-ins/twain/tw_mac.c                            |  228 -
 plug-ins/twain/tw_platform.h                       |   24 -
 po-libgimp/de.po                                   | 1543 +-
 po-libgimp/hu.po                                   |  125 +-
 po-libgimp/pl.po                                   |  165 +-
 po-plug-ins/POTFILES.in                            |    5 +-
 po-plug-ins/de.po                                  | 7394 ++--
 po-plug-ins/es.po                                  |  111 +-
 po-plug-ins/oc.po                                  |10813 +++---
 po-plug-ins/pl.po                                  |  657 +-
 po-python/POTFILES.skip                            |    1 +
 po-python/de.po                                    |  153 +-
 po-script-fu/POTFILES.skip                         |    1 +
 po/POTFILES.in                                     |    5 +-
 po/de.po                                           | 5400 ++--
 po/el.po                                           | 1148 +-
 po/es.po                                           | 1987 +-
 po/it.po                                           | 1702 +-
 po/pl.po                                           | 1456 +-
 po/pt.po                                           | 7421 ++--
 tools/pdbgen/README                                |   28 +-
 tools/pdbgen/README_NEW_PDB_PROC                   |    2 +-
 tools/pdbgen/enums.pl                              |    5 +-
 tools/pdbgen/pdb/color.pdb                         |    7 +-
 tools/pdbgen/pdb/drawable_color.pdb                |    9 +-
 tools/pdbgen/pdb/fonts.pdb                         |    5 +-
 tools/pdbgen/pdb/image_convert.pdb                 |   28 +-
 tools/pdbgen/pdb/item.pdb                          |    2 +-
 tools/pdbgen/pdb/selection.pdb                     |   10 +-
 1030 files changed, 101077 insertions(+), 88854 deletions(-)
---
diff --cc app/xcf/xcf-load.c
index 4f5b0bf,82ef7e5..96c58b1
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@@ -342,17 -331,27 +344,25 @@@ xcf_load_image (Gimp     *gimp
                        "has both 'gimp-image-metadata' and 'gimp-metadata' "
                        "parasites, dropping old 'gimp-metadata'\n");
          }
+       else if (xmp_length < 14 ||
+                strncmp (xmp_data, "GIMP_XMP_1", 10) != 0)
+         {
+           gimp_message (gimp, G_OBJECT (info->progress),
+                         GIMP_MESSAGE_WARNING,
+                         _("Corrupt 'gimp-metadata' parasite discovered.\n"
+                           "XMP data could not be migrated."));
+         }
        else
          {
 -          GimpMetadata *metadata = gimp_image_get_metadata (image);
 -          GError       *my_error = NULL;
 +          GimpMetadata   *metadata = NULL;
 +          GimpAttributes *attributes = NULL;
 +          GError         *my_error = NULL;
  
 -          if (metadata)
 -            g_object_ref (metadata);
 -          else
 -            metadata = gimp_metadata_new ();
 +          metadata = gimp_metadata_new ();
  
            if (! gimp_metadata_set_from_xmp (metadata,
-                                             gimp_parasite_data (parasite),
-                                             gimp_parasite_data_size (parasite),
+                                             (const guint8 *) xmp_data + 10,
+                                             xmp_length - 10,
                                              &my_error))
              {
                gimp_message (gimp, G_OBJECT (info->progress),
diff --cc plug-ins/file-tiff/file-tiff-load.c
index 48dc618,ffbd066..16672f0
--- a/plug-ins/file-tiff/file-tiff-load.c
+++ b/plug-ins/file-tiff/file-tiff-load.c
@@@ -218,8 -218,7 +218,8 @@@ load_dialog (TIFF              *tif
  }
  
  gint32
- load_image (const gchar        *filename,
+ load_image (GFile              *file,
 +            gint32             *layer_ID,
              TIFF               *tif,
              TiffSelectedPages  *pages,
              gboolean           *resolution_loaded,
diff --cc plug-ins/file-tiff/file-tiff-load.h
index be8883a,372af71..5695039
--- a/plug-ins/file-tiff/file-tiff-load.h
+++ b/plug-ins/file-tiff/file-tiff-load.h
@@@ -36,8 -36,7 +36,8 @@@ gboolean   load_dialog (TIF
                          const gchar        *help_id,
                          TiffSelectedPages  *pages);
  
- gint32     load_image  (const gchar        *filename,
+ gint32     load_image  (GFile              *file,
 +                        gint32             *layer_ID,
                          TIFF               *tif,
                          TiffSelectedPages  *pages,
                          gboolean           *resolution_loaded,
diff --cc plug-ins/file-tiff/file-tiff.c
index b276237,5135d13..3abb4dc
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@@ -462,9 -464,8 +465,8 @@@ run (const gchar      *name
                            image, drawable, orig_image, image_comment,
                            &saved_bpp, &error))
              {
 -              if (metadata)
 +              if (attributes)
                  {
-                   GFile *file;
  
                    /* See bug 758909: clear TIFFTAG_MIN/MAXSAMPLEVALUE because
                     * exiv2 saves them with wrong type and the original values
@@@ -493,12 -494,10 +495,10 @@@
                    /* never save metadata thumbnails for TIFF, see bug #729952 */
                    metadata_flags &= ~GIMP_METADATA_SAVE_THUMBNAIL;
  
-                   file = g_file_new_for_path (param[3].data.d_string);
                    gimp_image_metadata_save_finish (image,
                                                     "image/tiff",
 -                                                   metadata, metadata_flags,
 +                                                   attributes, metadata_flags,
                                                     file, NULL);
-                   g_object_unref (file);
                  }
  
                /*  Store mvals data  */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]