Commit 3cf24830 authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.6.4

parent 15545dd8
2009-01-01 Sven Neumann <sven@gimp.org>
* Made 2.6.4 release.
2009-01-01 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 565223 – Perspective transformation jagged edges / comb effect
* app/core/gimp-transform-region.c: reverted the code change, but
not the cleanups, from commit r26786.
2008-12-28 Sven Neumann <sven@gimp.org>
* app/tools/gimpgegltool.c (gimp_param_spec_duplicate): fixed
handling of GEGL minor version number in compile-time check.
2008-12-28 Sven Neumann <sven@gimp.org>
* app/tools/gimpgegltool.c (gimp_param_spec_duplicate): fixed typo
in GEGL version number check.
2008-12-28 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 563985 – jpg save dialog: "cancel" is treated like "commit"
for settings
* plug-ins/file-jpeg/jpeg.c (run): only attach the comment and
settings to the image if the save was successful.
2008-12-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 564087 – Using clone tool on a layer with a part out of canvas
causes crashes
* app/paint/gimppaintcore.c (gimp_paint_core_paste): intersect the
rectangle with the extents of the saved projection.
2008-12-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 564593 – crash when the drawable is changed while a color
tools is active
* app/core/gimpdrawable-shadow.c (gimp_drawable_merge_shadow_tiles):
keep a reference to the shadow tiles because it might otherwise be
free'd under our feet.
2008-12-21 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 564869 – GIMP crashes on selecting Tools->GEGL operation
* app/tools/gimptool.c (gimp_tool_initialize): check if the tool
has set an error.
2008-12-21 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 565138 – python-fu-foggify does not check if image is in rgb mode
* plug-ins/pygimp/plug-ins/foggify.py (foggify): fixed handling of
grayscale images.
2008-12-04 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 563130 – Hue selection mode does not cross the 0-360 degrees line
* app/core/gimpimage-contiguous-region.c (pixel_difference):
applied patch from Daniel Hornung.
2008-12-04 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
Bug 563179 – Scrollbars not resized when we extend the canvas size
* app/display/gimpdisplayshell-handlers.c
(gimp_display_shell_size_changed_detailed_handler): Add explicit
call to gimp_display_shell_scroll_clamp_and_update() at the end to
make sure it is called.
2008-12-04 Sven Neumann <sven@gimp.org>
Merged from trunk:
* tools/pdbgen/pdb/convert.pdb: fixed an error in the documentation
of the gimp-image-convert-rgb procedure.
* app/pdb/convert-cmds.c
* libgimp/gimpconvert_pdb.c: regenerated.
2008-12-03 Sven Neumann <sven@gimp.org>
* app/core/gimpimagemap.c (gimp_image_map_apply): when compiling
against GEGL from trunk, use "gegl:translate" instead of "shift".
2008-11-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 562459 – PF_PALETTE: 'TypeError' when used in a plugin that is
registered in <Image>
* plug-ins/pygimp/gimpui.defs (gimp_palette_select_button_new):
the 'title' parameter is optional.
2008-11-27 Michael Natterer <mitch@gimp.org>
Merged from trunk:
Bug 562427 – Compilation with --as-needed
* app/Makefile.am (gimp_console_2_7_LDADD): add $(GLIB_LIBS) so
libgthread gets pulled in explicitely.
2008-11-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 562386 – PF_SLIDER and PF_SPINNER 'Step' values do not change
consistently...
* plug-ins/pygimp/gimpfu.py (SliderEntry): set the precision on
the slider just as we do it for the spin-button.
2008-11-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/pygimp/gimpfu.py (SpinnerEntry): let SpinnerEntry
return a float instead of trying to convert the value to an int.
2008-11-27 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 562386 – PF_SLIDER and PF_SPINNER 'Step' values do not change
consistently...
* plug-ins/pygimp/gimpfu.py (SpinnerEntry): initialize the
spin-button the way that gtk_spin_button_new_with_range() is
implemented.
2008-11-26 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
Bug 562366 – Default image dimensions are not correctly
transferred in the file/new dialog box
* app/dialogs/preferences-dialog.c
(prefs_template_select_callback): We need to copy the template in
the same way as in the New Image dialog.
* app/dialogs/image-new-dialog.c (image_new_dialog_set): ... and
when we copy the template to the New Image dialog.
2008-11-22 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 561899 – GIMP can't save to mounted filesystem if file exists
* plug-ins/file-uri/uri-backend-gvfs.c (copy_uri): pass the
G_FILE_COPY_OVERWRITE flag to g_file_copy().
2008-11-21 Sven Neumann <sven@gimp.org>
* configure.in: bumped version to 2.6.4 (interface age 4).
2008-11-21 Sven Neumann <sven@gimp.org>
* Made 2.6.3 release.
......
......@@ -7,8 +7,48 @@ This is the stable branch of GIMP. No new features are being added
here, just bug-fixes.
Overview of Changes since GIMP 2.6.2 to GIMP 2.6.3
==================================================
Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
=================================================
* Bugs fixed:
565223 – Perspective transformation jagged edges / comb effect
563985 – jpg save dialog: "cancel" is treated like "commit"
for settings
564087 – Using clone tool on a layer with a part out of canvas
causes crashes
564593 – crash when the drawable is changed while a color tool
is active
564869 – GIMP crashes on selecting Tools->GEGL operation
565138 – python-fu-foggify does not check if image is in rgb mode
563130 – Hue selection mode does not cross the 0-360 degrees line
563179 – Scrollbars not resized when we extend the canvas size
562459 – PF_PALETTE: 'TypeError' when used in a plugin that is
registered in <Image>
562427 – Compilation with --as-needed
562386 – PF_SLIDER and PF_SPINNER 'Step' values do not change
consistently...
562366 – Default image dimensions are not correctly
transferred in the file/new dialog box
561899 – GIMP can't save to mounted filesystem if file exists
* Updated translations:
Greek (el)
Hindi (hi)
Hungarian (hu)
Italian (it)
Japanese (ja)
Korean (ko)
Slovenian (sl)
Swedish (sv)
Tamil (ta)
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.2 to GIMP 2.6.3
=================================================
* Bugs fixed:
......
......@@ -182,6 +182,7 @@ gimp_console_2_6_LDADD = \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GEGL_LIBS) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)
......
......@@ -118,6 +118,7 @@ gimp_console_2_6_OBJECTS = $(am_gimp_console_2_6_OBJECTS)
@ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(am__DEPENDENCIES_1) $(GIMPICONRC)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
......@@ -617,6 +618,7 @@ gimp_2_6_LDADD = \
@ENABLE_GIMP_CONSOLE_TRUE@ $(FONTCONFIG_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(FREETYPE_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GEGL_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GLIB_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(RT_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(INTLLIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GIMPICONRC)
......
This diff is collapsed.
......@@ -89,14 +89,16 @@ gimp_drawable_merge_shadow_tiles (GimpDrawable *drawable,
*/
if (gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height))
{
PixelRegion shadowPR;
TileManager *tiles = tile_manager_ref (drawable->shadow);
PixelRegion shadowPR;
pixel_region_init (&shadowPR, drawable->shadow,
x, y, width, height, FALSE);
pixel_region_init (&shadowPR, tiles, x, y, width, height, FALSE);
gimp_drawable_apply_region (drawable, &shadowPR,
push_undo, undo_desc,
GIMP_OPACITY_OPAQUE, GIMP_REPLACE_MODE,
NULL, x, y);
tile_manager_unref (tiles);
}
}
......@@ -379,36 +379,44 @@ pixel_difference (const guchar *col1,
break;
case GIMP_SELECT_CRITERION_H:
av0 = (gint)col1[0];
av1 = (gint)col1[1];
av2 = (gint)col1[2];
bv0 = (gint)col2[0];
bv1 = (gint)col2[1];
bv2 = (gint)col2[2];
av0 = (gint) col1[0];
av1 = (gint) col1[1];
av2 = (gint) col1[2];
bv0 = (gint) col2[0];
bv1 = (gint) col2[1];
bv2 = (gint) col2[2];
gimp_rgb_to_hsv_int (&av0, &av1, &av2);
gimp_rgb_to_hsv_int (&bv0, &bv1, &bv2);
max = abs (av0 - bv0);
/* wrap around candidates for the actual distance */
{
gint dist1 = abs (av0 - bv0);
gint dist2 = abs (av0 - 360 - bv0);
gint dist3 = abs (av0 - bv0 + 360);
max = MIN (dist1, dist2);
if (max > dist3)
max = dist3;
}
break;
case GIMP_SELECT_CRITERION_S:
av0 = (gint)col1[0];
av1 = (gint)col1[1];
av2 = (gint)col1[2];
bv0 = (gint)col2[0];
bv1 = (gint)col2[1];
bv2 = (gint)col2[2];
av0 = (gint) col1[0];
av1 = (gint) col1[1];
av2 = (gint) col1[2];
bv0 = (gint) col2[0];
bv1 = (gint) col2[1];
bv2 = (gint) col2[2];
gimp_rgb_to_hsv_int (&av0, &av1, &av2);
gimp_rgb_to_hsv_int (&bv0, &bv1, &bv2);
max = abs (av1 - bv1);
break;
case GIMP_SELECT_CRITERION_V:
av0 = (gint)col1[0];
av1 = (gint)col1[1];
av2 = (gint)col1[2];
bv0 = (gint)col2[0];
bv1 = (gint)col2[1];
bv2 = (gint)col2[2];
av0 = (gint) col1[0];
av1 = (gint) col1[1];
av2 = (gint) col1[2];
bv0 = (gint) col2[0];
bv1 = (gint) col2[1];
bv2 = (gint) col2[2];
gimp_rgb_to_hsv_int (&av0, &av1, &av2);
gimp_rgb_to_hsv_int (&bv0, &bv1, &bv2);
max = abs (av2 - bv2);
......
......@@ -471,7 +471,7 @@ gimp_image_map_apply (GimpImageMap *image_map,
NULL);
shift_name =
gimp_gegl_check_version (0, 0, 21) ? "gegl:shift" : "shift";
gimp_gegl_check_version (0, 0, 21) ? "gegl:translate" : "shift";
image_map->shift =
gegl_node_new_child (image_map->gegl,
......
......@@ -187,7 +187,11 @@ image_new_dialog_set (GtkWidget *widget,
template = gimp_image_new_get_last_template (dialog->context->gimp,
image);
gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template), 0);
/* make sure the resolution values are copied first (see bug #546924) */
gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
GIMP_TEMPLATE_PARAM_COPY_FIRST);
gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
0);
g_object_unref (template);
}
......
......@@ -425,7 +425,13 @@ prefs_template_select_callback (GimpContainerView *view,
GimpTemplate *edit_template)
{
if (template)
gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template), 0);
{
/* make sure the resolution values are copied first (see bug #546924) */
gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
GIMP_TEMPLATE_PARAM_COPY_FIRST);
gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
0);
}
}
static void
......
......@@ -538,6 +538,13 @@ gimp_display_shell_size_changed_detailed_handler (GimpImage *image,
shell->offset_y + scaled_previous_origin_y);
gimp_display_shell_scroll_center_image (shell, horizontally, vertically);
/* The above calls might not lead to a call to
* gimp_display_shell_scroll_clamp_and_update() in all cases we
* need it to be called, so simply call it explicitly here at
* the end
*/
gimp_display_shell_scroll_clamp_and_update (shell);
}
}
......
......@@ -22,6 +22,8 @@
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "paint-types.h"
#include "base/pixel-region.h"
......@@ -799,15 +801,24 @@ gimp_paint_core_paste (GimpPaintCore *core,
GimpProjection *projection = gimp_image_get_projection (image);
gint off_x;
gint off_y;
gint x, y;
gint w, h;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_paint_core_validate_saved_proj_tiles (core,
GIMP_PICKABLE (projection),
core->canvas_buf->x + off_x,
core->canvas_buf->y + off_y,
core->canvas_buf->width,
core->canvas_buf->height);
if (gimp_rectangle_intersect (core->canvas_buf->x + off_x,
core->canvas_buf->y + off_y,
core->canvas_buf->width,
core->canvas_buf->height,
0, 0,
tile_manager_width (core->saved_proj_tiles),
tile_manager_height (core->saved_proj_tiles),
&x, &y, &w, &h))
{
gimp_paint_core_validate_saved_proj_tiles (core,
GIMP_PICKABLE (projection),
x, y, w, h);
}
}
/* If the mode is CONSTANT:
......
......@@ -216,7 +216,7 @@ register_convert_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-image-convert-rgb",
"Convert specified image to RGB color",
"This procedure converts the specified image to RGB color. This process requires an image in RGB or Indexed color mode. No image content is lost in this process aside from the colormap for an indexed image.",
"This procedure converts the specified image to RGB color. This process requires an image in Grayscale or Indexed color mode. No image content is lost in this process aside from the colormap for an indexed image.",
"Spencer Kimball & Peter Mattis",
"Spencer Kimball & Peter Mattis",
"1995-1996",
......
......@@ -446,10 +446,10 @@ gimp_param_spec_duplicate (GParamSpec *pspec)
{
GParamSpecString *spec = G_PARAM_SPEC_STRING (pspec);
#if ((GEGL_MAGOR_VERSION == 0) && \
(GEGL_MINOR_VERSION == 0) && \
(GEGL_MICRO_VERSION >= 21))
if (GEGL_IS_PARAM_SPEC_FILE_PATH (pspec))
#if (GEGL_MAJOR_VERSION > 0 || \
(GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION > 0) || \
(GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 0 && GEGL_MICRO_VERSION >= 21))
if (GEGL_IS_PARAM_SPEC_FILE_PATH (pspec))
#else
if (GEGL_IS_PARAM_SPEC_PATH (pspec))
#endif
......
......@@ -427,8 +427,12 @@ gimp_tool_initialize (GimpTool *tool,
if (! GIMP_TOOL_GET_CLASS (tool)->initialize (tool, display, &error))
{
gimp_tool_message (tool, display, error->message);
g_clear_error (&error);
if (error)
{
gimp_tool_message (tool, display, error->message);
g_clear_error (&error);
}
return FALSE;
}
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.3.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.4.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>.
#
......@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GIMP'
PACKAGE_TARNAME='gimp'
PACKAGE_VERSION='2.6.3'
PACKAGE_STRING='GIMP 2.6.3'
PACKAGE_VERSION='2.6.4'
PACKAGE_STRING='GIMP 2.6.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
ac_unique_file="app/core/gimp.c"
......@@ -1708,7 +1708,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures GIMP 2.6.3 to adapt to many kinds of systems.
\`configure' configures GIMP 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1782,7 +1782,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GIMP 2.6.3:";;
short | recursive ) echo "Configuration of GIMP 2.6.4:";;
esac
cat <<\_ACEOF
......@@ -2001,7 +2001,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GIMP configure 2.6.3
GIMP configure 2.6.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -2015,7 +2015,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by GIMP $as_me 2.6.3, which was
It was created by GIMP $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2708,7 +2708,7 @@ fi
# Define the identity of the package.
PACKAGE='gimp'
VERSION='2.6.3'
VERSION='2.6.4'
# Some tools Automake needs.
......@@ -2850,11 +2850,11 @@ ac_config_headers="$ac_config_headers config.h"
GIMP_MAJOR_VERSION=2
GIMP_MINOR_VERSION=6
GIMP_MICRO_VERSION=3
GIMP_INTERFACE_AGE=3
GIMP_BINARY_AGE=603
GIMP_VERSION=2.6.3
GIMP_REAL_VERSION=2.6.3
GIMP_MICRO_VERSION=4
GIMP_INTERFACE_AGE=4
GIMP_BINARY_AGE=604
GIMP_VERSION=2.6.4
GIMP_REAL_VERSION=2.6.4
GIMP_API_VERSION=2.0
GIMP_APP_VERSION=2.6
GIMP_PLUGIN_VERSION=2.0
......@@ -2914,7 +2914,7 @@ fi
LT_VERSION_INFO="600:3:600"
LT_VERSION_INFO="600:4:600"
LT_CURRENT_MINUS_AGE=0
......@@ -37596,7 +37596,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by GIMP $as_me 2.6.3, which was
This file was extended by GIMP $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -37649,7 +37649,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
GIMP config.status 2.6.3
GIMP config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......@@ -37758,8 +37758,8 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
gimp_major_ver=2
gimp_minor_ver=6
gimp_micro_ver=3
gimp_ver=2.6.3
gimp_micro_ver=4
gimp_ver=2.6.4
gimp_api_ver=2.0
......@@ -8,11 +8,11 @@ AC_PREREQ(2.54)
m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [6])
m4_define([gimp_micro_version], [3])
m4_define([gimp_micro_version], [4])
m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version])
m4_define([gimp_interface_age], [3])
m4_define([gimp_interface_age], [4])
m4_define([gimp_binary_age],
[m4_eval(100 * gimp_minor_version + gimp_micro_version)])
......
This diff is collapsed.
......@@ -27,7 +27,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GIMP Library Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
for GIMP 2.6.3
for GIMP 2.6.4
</p></div>
</div>
......
......@@ -105,8 +105,8 @@ Convert specified image to RGB color
</p>
<p>
This procedure converts the specified image to RGB color. This
process requires an image in RGB or Indexed color mode. No image
content is lost in this process aside from the colormap for an
process requires an image in Grayscale or Indexed color mode. No
image content is lost in this process aside from the colormap for an
indexed image.</p>
<p>
......
......@@ -62,8 +62,8 @@ Convert specified image to RGB color
</para>
<para>
This procedure converts the specified image to RGB color. This
process requires an image in RGB or Indexed color mode. No image
content is lost in this process aside from the colormap for an
process requires an image in Grayscale or Indexed color mode. No
image content is lost in this process aside from the colormap for an
indexed image.</para>
<para>
......
......@@ -21,7 +21,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GIMP Base Library Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
for GIMP 2.6.3
for GIMP 2.6.4
</p></div>
</div>
......
......@@ -85,7 +85,7 @@ capabilities.
<hr>
<div class="refsect2" lang="en">
<a name="GIMP-MICRO-VERSION:CAPS"></a><h3>GIMP_MICRO_VERSION</h3>
<pre class="programlisting">#define GIMP_MICRO_VERSION (3)
<pre class="programlisting">#define GIMP_MICRO_VERSION (4)
</pre>
<p>
......@@ -94,7 +94,7 @@ capabilities.
<hr>
<div class="refsect2" lang="en">
<a name="GIMP-VERSION:CAPS"></a><h3>GIMP_VERSION</h3>
<pre class="programlisting">#define GIMP_VERSION "2.6.3"
<pre class="programlisting">#define GIMP_VERSION "2.6.4"
</pre>
<p>
......
......@@ -68,14 +68,14 @@ capabilities.
</para></refsect2>
<refsect2 id="GIMP-MICRO-VERSION:CAPS" role="macro">
<title>GIMP_MICRO_VERSION</title>
<indexterm zone="GIMP-MICRO-VERSION:CAPS"><primary>GIMP_MICRO_VERSION</primary></indexterm><programlisting>#define GIMP_MICRO_VERSION (3)
<indexterm zone="GIMP-MICRO-VERSION:CAPS"><primary>GIMP_MICRO_VERSION</primary></indexterm><programlisting>#define GIMP_MICRO_VERSION (4)
</programlisting>
<para>
</para></refsect2>
<refsect2 id="GIMP-VERSION:CAPS" role="macro">
<title>GIMP_VERSION</title>
<indexterm zone="GIMP-VERSION:CAPS"><primary>GIMP_VERSION</primary></indexterm><programlisting>#define GIMP_VERSION "2.6.3"
<indexterm zone="GIMP-VERSION:CAPS"><primary>GIMP_VERSION</primary></indexterm><programlisting>#define GIMP_VERSION "2.6.4"
</programlisting>
<para>
......
......@@ -32,8 +32,8 @@
* Convert specified image to RGB color
*
* This procedure converts the specified image to RGB color. This
* process requires an image in RGB or Indexed color mode. No image
* content is lost in this process aside from the colormap for an
* process requires an image in Grayscale or Indexed color mode. No
* image content is lost in this process aside from the colormap for an
* indexed image.
*
* Returns: TRUE on success.
......
......@@ -11,8 +11,8 @@ G_BEGIN_DECLS
#define GIMP_MAJOR_VERSION (2)
#define GIMP_MINOR_VERSION (6)
#define GIMP_MICRO_VERSION (3)
#define GIMP_VERSION "2.6.3"
#define GIMP_MICRO_VERSION (4)
#define GIMP_VERSION "2.6.4"
#define GIMP_API_VERSION "2.0"
#define GIMP_CHECK_VERSION(major, minor, micro) \
(GIMP_MAJOR_VERSION > (major) || \
......
......@@ -498,28 +498,31 @@ run (const gchar *name,
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
}
/* pw - now we need to change the defaults to be whatever
* was used to save this image. Dump the old parasites
* and add new ones. */
}
gimp_image_parasite_detach (orig_image_ID, "gimp-comment");
if (image_comment && strlen (image_comment))
if (status == GIMP_PDB_SUCCESS)
{
parasite = gimp_parasite_new ("gimp-comment",
GIMP_PARASITE_PERSISTENT,
strlen (image_comment) + 1,
image_comment);
/* pw - now we need to change the defaults to be whatever
* was used to save this image. Dump the old parasites
* and add new ones. */
gimp_image_parasite_detach (orig_image_ID, "gimp-comment");
if (image_comment && strlen (image_comment))
{