[gimp/soc-2013-psd: 129/129] Merge branch 'master' into soc-2013-psd. Done to fix a rendering bug that appeared when the plugin w
- From: Simon Lui <simonlui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2013-psd: 129/129] Merge branch 'master' into soc-2013-psd. Done to fix a rendering bug that appeared when the plugin w
- Date: Sun, 25 Aug 2013 19:05:27 +0000 (UTC)
commit ae5722252a35be773eb48282637d1017e679bad2
Merge: 04418f4 c64cb2d
Author: Simon Lui <simonlui src gnome org>
Date: Sun Aug 25 14:30:44 2013 -0400
Merge branch 'master' into soc-2013-psd. Done to fix a rendering bug that
appeared when the plugin was rewritten to use GEGL.
app/actions/colormap-actions.c | 2 +-
app/actions/debug-commands.c | 2 +-
app/actions/drawable-commands.c | 3 +-
app/actions/file-commands.c | 146 +-
app/actions/filters-actions.c | 23 +
app/actions/image-actions.c | 162 +-
app/actions/image-commands.c | 18 +-
app/actions/view-commands.c | 4 +-
app/actions/windows-commands.c | 1 +
app/app.c | 56 +-
app/core/core-enums.c | 65 +-
app/core/core-enums.h | 29 +-
app/core/gimp.c | 3 +
app/core/gimp.h | 2 +
app/core/gimpbrushclipboard.c | 4 +-
app/core/gimpbuffer.c | 4 +-
app/core/gimpchannel.c | 8 +-
app/core/gimpdata.c | 21 +-
app/core/gimpdata.h | 5 +-
app/core/gimpdrawable-blend.c | 4 +-
app/core/gimpdrawable.c | 24 +-
app/core/gimpdrawable.h | 1 +
app/core/gimpgrouplayer.c | 2 +
app/core/gimpimage-colormap.c | 36 +-
app/core/gimpimage-colormap.h | 2 +
app/core/gimpimage-contiguous-region.c | 2 +-
app/core/gimpimage-convert-precision.c | 41 +-
app/core/gimpimage-convert-type.c | 2 +-
app/core/gimpimage-merge.c | 54 +-
app/core/gimpimage-merge.h | 3 +-
app/core/gimpimage-new.c | 2 +-
app/core/gimpimage-preview.c | 2 +-
app/core/gimpimage-scale.c | 11 +-
app/core/gimpimage.c | 18 +-
app/core/gimpimage.h | 1 +
app/core/gimpimageundo.c | 9 +-
app/core/gimplayer-floating-sel.c | 5 +
app/core/gimplayer.c | 40 +
app/core/gimppatternclipboard.c | 4 +-
app/core/gimpprojection.c | 255 +-
app/core/gimpprojection.h | 35 +-
app/core/gimptempbuf.c | 8 +-
app/core/gimptemplate.c | 4 +-
app/dialogs/file-save-dialog.c | 205 +-
app/dialogs/file-save-dialog.h | 3 +
app/display/gimpcanvasarc.c | 4 +-
app/display/gimpdisplayshell-expose.c | 1 +
app/display/gimpdisplayshell-filter.c | 1 +
app/display/gimpdisplayshell-grab.c | 1 +
app/display/gimpdisplayshell-items.c | 1 +
app/display/gimpdisplayshell-progress.c | 1 +
app/display/gimpdisplayshell-render.c | 23 +-
app/display/gimpdisplayshell-selection.c | 4 +-
app/display/gimpdisplayshell.c | 17 +-
app/display/gimpdisplayshell.h | 4 +-
app/display/gimpimagewindow.c | 100 +-
app/display/gimpimagewindow.h | 2 +
app/display/gimptoolgui.c | 32 +-
app/file/file-open.c | 20 +-
app/gegl/gimp-babl-compat.c | 2 +-
app/gegl/gimp-babl.c | 583 ++-
app/gegl/gimp-babl.h | 32 +-
app/gegl/gimp-gegl-apply-operation.c | 30 +-
app/gegl/gimp-gegl-apply-operation.h | 7 +-
app/gegl/gimp-gegl-loops.c | 10 +-
app/gegl/gimpapplicator.c | 1 -
app/gegl/gimptilehandlerprojection.c | 52 +-
app/gegl/gimptilehandlerprojection.h | 5 +
app/gimp-log.c | 3 +-
app/gimp-log.h | 4 +-
app/gui/Makefile.am | 2 +
app/gui/gimpuiconfigurer.c | 27 +-
app/gui/gui.c | 4 +
app/operations/.gitignore | 3 +
app/operations/Makefile.am | 35 +-
app/operations/gimpoperationadditionmode.c | 4 +-
app/operations/gimpoperationadditionmode.h | 2 +-
app/operations/gimpoperationantierasemode.c | 8 +-
app/operations/gimpoperationantierasemode.h | 2 +-
app/operations/gimpoperationbehindmode.c | 8 +-
app/operations/gimpoperationbehindmode.h | 2 +-
app/operations/gimpoperationburnmode.c | 6 +-
app/operations/gimpoperationburnmode.h | 2 +-
app/operations/gimpoperationcolorerasemode.c | 4 +-
app/operations/gimpoperationcolorerasemode.h | 2 +-
app/operations/gimpoperationcolormode.c | 4 +-
app/operations/gimpoperationcolormode.h | 2 +-
app/operations/gimpoperationdarkenonlymode.c | 6 +-
app/operations/gimpoperationdarkenonlymode.h | 2 +-
app/operations/gimpoperationdifferencemode.c | 4 +-
app/operations/gimpoperationdifferencemode.h | 2 +-
app/operations/gimpoperationdissolvemode.c | 6 +-
app/operations/gimpoperationdissolvemode.h | 2 +-
app/operations/gimpoperationdividemode.c | 6 +-
app/operations/gimpoperationdividemode.h | 2 +-
app/operations/gimpoperationdodgemode.c | 6 +-
app/operations/gimpoperationdodgemode.h | 2 +-
app/operations/gimpoperationerasemode.c | 8 +-
app/operations/gimpoperationerasemode.h | 2 +-
app/operations/gimpoperationgrainextractmode.c | 6 +-
app/operations/gimpoperationgrainextractmode.h | 2 +-
app/operations/gimpoperationgrainmergemode.c | 4 +-
app/operations/gimpoperationgrainmergemode.h | 2 +-
app/operations/gimpoperationhardlightmode.c | 4 +-
app/operations/gimpoperationhardlightmode.h | 2 +-
app/operations/gimpoperationhuemode.c | 4 +-
app/operations/gimpoperationhuemode.h | 2 +-
app/operations/gimpoperationlightenonlymode.c | 4 +-
app/operations/gimpoperationlightenonlymode.h | 2 +-
app/operations/gimpoperationmultiplymode.c | 4 +-
app/operations/gimpoperationmultiplymode.h | 2 +-
app/operations/gimpoperationnormalmode-sse2.c | 117 +
app/operations/gimpoperationnormalmode-sse4.c | 116 +
app/operations/gimpoperationnormalmode.c | 34 +-
app/operations/gimpoperationnormalmode.h | 34 +-
app/operations/gimpoperationoverlaymode.c | 4 +-
app/operations/gimpoperationoverlaymode.h | 2 +-
app/operations/gimpoperationpointlayermode.c | 6 -
app/operations/gimpoperationreplacemode.c | 4 +-
app/operations/gimpoperationreplacemode.h | 5 +-
app/operations/gimpoperationsaturationmode.c | 4 +-
app/operations/gimpoperationsaturationmode.h | 2 +-
app/operations/gimpoperationscreenmode.c | 4 +-
app/operations/gimpoperationscreenmode.h | 2 +-
app/operations/gimpoperationsoftlightmode.c | 4 +-
app/operations/gimpoperationsoftlightmode.h | 2 +-
app/operations/gimpoperationsubtractmode.c | 4 +-
app/operations/gimpoperationsubtractmode.h | 2 +-
app/operations/gimpoperationvaluemode.c | 4 +-
app/operations/gimpoperationvaluemode.h | 2 +-
app/operations/operations-types.h | 2 +-
app/paint/gimppaintcore-stroke.c | 13 +-
app/paint/gimppaintcore.c | 4 +-
app/paint/gimppaintcore.h | 2 +-
app/pdb/color-cmds.c | 2 +-
app/pdb/convert-cmds.c | 4 +-
app/pdb/image-cmds.c | 12 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/layer-cmds.c | 2 +-
app/pdb/plug-in-compat-cmds.c | 776 ++++-
app/plug-in/gimpplugin.c | 5 -
app/plug-in/gimpplugindef.c | 2 +-
app/plug-in/gimpplugindef.h | 6 +-
app/plug-in/gimppluginmanager-call.c | 5 +-
app/plug-in/gimppluginprocedure.h | 3 +-
app/plug-in/plug-in-rc.c | 7 +-
app/sanity.c | 104 +
app/tests.c | 4 +-
app/tests/gimp-app-test-utils.c | 2 +-
app/tests/test-core.c | 2 +-
app/tests/test-xcf.c | 2 +-
app/tools/gimpbrightnesscontrasttool.c | 2 +-
app/tools/gimpcurvestool.c | 2 +-
app/tools/gimpforegroundselecttool.c | 53 +-
app/tools/gimpforegroundselecttool.h | 4 +-
app/tools/gimpgegltool.c | 7 +-
app/tools/gimplevelstool.c | 2 +-
app/tools/gimpoperationtool.c | 181 +-
app/tools/gimpoperationtool.h | 2 +
app/tools/gimppainttool.c | 15 +-
app/tools/gimptool-progress.c | 1 +
app/tools/gimptransformtool.c | 8 +-
app/tools/gimpwarptool.c | 18 +-
app/vectors/gimpbezierstroke.c | 3 +-
app/widgets/gimpcolorframe.c | 27 +-
app/widgets/gimpcontainergridview.c | 10 +-
app/widgets/gimpimagepropview.c | 29 +-
app/widgets/gimplanguagestore-parser.c | 339 ++-
app/widgets/gimplanguagestore-parser.h | 7 +-
app/widgets/gimplanguagestore.c | 29 +-
app/widgets/gimplanguagestore.h | 6 -
app/widgets/gimpoverlaydialog.c | 23 +
app/widgets/gimpoverlaydialog.h | 35 +-
app/widgets/gimppaletteview.c | 2 +-
app/widgets/gimpprogressdialog.c | 2 +
app/widgets/gimptranslationstore.c | 123 +-
app/xcf/xcf-load.c | 37 +-
app/xcf/xcf-save.c | 4 +-
app/xcf/xcf.c | 3 +-
autogen.sh | 3 +
configure.ac | 36 +
libgimp/gimp.def | 1 +
libgimp/gimpenums.c.tail | 2 +
libgimp/gimpenums.h | 29 +-
libgimp/gimpexport.c | 2 +-
libgimp/gimpimage_pdb.c | 2 +-
libgimp/gimplayer_pdb.c | 2 +-
libgimpbase/Makefile.am | 4 +-
libgimpbase/gimpcpuaccel.c | 18 +-
libgimpbase/gimpcpuaccel.h | 4 +
libgimpbase/gimpdatafiles.c | 65 +-
libgimpconfig/gimpconfig.def | 1 +
libgimpconfig/gimpscanner.c | 35 +
libgimpconfig/gimpscanner.h | 2 +
libgimpthumb/Makefile.am | 6 +-
libgimpthumb/gimpthumb-utils.c | 67 +-
menus/image-menu.xml.in | 22 +-
modules/color-selector-wheel.c | 1 +
modules/gimpcolorwheel.c | 13 +-
modules/gimpcolorwheel.h | 2 +
plug-ins/common/.gitignore | 10 -
plug-ins/common/Makefile.am | 89 +-
plug-ins/common/alien-map.c | 684 ---
plug-ins/common/antialias.c | 324 --
plug-ins/common/blur-motion.c | 1160 -----
plug-ins/common/border-average.c | 163 +-
plug-ins/common/channel-mixer.c | 1210 -----
plug-ins/common/compose.c | 1193 ++----
plug-ins/common/decompose.c | 266 +-
plug-ins/common/file-gegl.c | 113 +-
plug-ins/common/file-png.c | 14 +-
plug-ins/common/file-ps.c | 2 +-
plug-ins/common/file-tiff-load.c | 8 +-
plug-ins/common/file-tiff-save.c | 2 +-
plug-ins/common/gimprc.common | 5 -
plug-ins/common/gradient-map.c | 337 +-
plug-ins/common/plugin-defs.pl | 13 +-
plug-ins/common/tile-seamless.c | 357 --
plug-ins/file-bmp/bmp-read.c | 199 +-
plug-ins/file-exr/file-exr.c | 6 +-
plug-ins/file-fits/fits.c | 10 +-
plug-ins/file-jpeg/jpeg-load.c | 7 +-
plug-ins/gfig/gfig-dialog.c | 2 -
plug-ins/gfig/gfig.c | 19 +-
plug-ins/gfig/gfig.h | 1 -
po-libgimp/es.po | 167 +-
po-libgimp/pt_BR.po | 488 +-
po-plug-ins/POTFILES.in | 5 -
po-plug-ins/de.po | 1436 +++----
po-plug-ins/es.po | 1789 ++++----
po-script-fu/he.po | 2856 ++----------
po/POTFILES.in | 1 +
po/de.po | 8 +-
po/es.po | 3980 ++++++++++-------
po/gl.po | 5746 ++++++++++++++----------
po/pl.po | 204 +-
tools/gimptool.c | 9 +
tools/pdbgen/enums.pl | 39 +-
tools/pdbgen/pdb/color.pdb | 2 +-
tools/pdbgen/pdb/convert.pdb | 2 +-
tools/pdbgen/pdb/image.pdb | 8 +-
tools/pdbgen/pdb/layer.pdb | 2 +-
tools/pdbgen/pdb/plug_in_compat.pdb | 428 ++-
243 files changed, 13724 insertions(+), 14718 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
