Commit 478f5ecc authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.4.6

parent 9398f19f
2008-05-29 Sven Neumann <sven@gimp.org>
* Made 2.4.6 release.
2008-05-29 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/sel_gauss.c (matrixmult_mmx): avoid division by
zero in the grayscale code path (bug #529280).
2008-05-26 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/jpeg/jpeg-save.c (save_image): fixed logic that decides
if an EXIF block should be written (bug #529469).
2008-05-24 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_tool_events): fixed use of
gdk_device_get_history(). Fixes airbrush tool with tablets on
newer X.org releases.
2008-05-19 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/psd-save.c (save_layer_and_mask): corrected
"layer mask disabled" flag in layer mask data section (bug #526811).
2008-05-18 Kevin Cozens <kcozens@cvs.gnome.org>
* plug-ins/script-fu/tinyscheme/scheme.c: Reverting previous
change. I figured it would break something. It breaks the 'while'
macro by preventing use of a named let.
2008-05-16 Kevin Cozens <kcozens@cvs.gnome.org>
Merged from trunk:
* plug-ins/script-fu/tinyscheme/scheme.c: Added extra checks to stop
bad syntax in LET from causing a segmentation fault in Linux.
See bug #508020.
2008-05-14 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/core/gimpbrushclipboard.c
(gimp_brush_clipboard_buffer_changed): for an opaque buffer,
initialize the brush mask with 255 instead of 0. Fixes bug #532886.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.c: Fix emission of rectangle-changed
signal.
* app/tools/gimpcroptool.c
* app/tools/gimprectangleselecttool.c: Use the rectangle-changed
signal to update the default aspect ratio. Fixes bug #530519.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/tools/gimprectangletool.c
(gimp_rectangle_tool_button_press): Active the tool control
earlier.
(gimp_rectangle_tool_synthesize_motion): Bail out if the tool
control is active, we don't want to synthesize a motion in this
case as it emits unwanted rectangle-changed signals.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/tools/gimprectangleselecttool.c
(gimp_rectangle_select_tool_cancel): Don't forget updating the
default aspect ratio when cancelling a rectangle select.
2008-05-10 Manish Singh <yosh@gimp.org>
Merged from trunk:
* plug-ins/common/poppler.c: Support poppler 0.8.x.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/tools/gimprectangletool.c
(gimp_rectangle_tool_button_release): Update the tool options
after a release; the rectangle might change if a rubber-banding is
cancelled.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/tools/gimpcroptool.c: Add a GimpRectangleTool::cancel()
implementation that updates default aspect ratio when cancelling a
crop.
2008-05-10 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/tools/gimpcroptool.[ch]: Keep track of the current image and
manage a subscription to "size-changed" so that default aspect
ratio is properly updated. (Bug #532057.)
(gimp_crop_tool_execute): No need to explicitly call
gimp_crop_tool_update_option_defaults() any longer.
2008-05-06 Sven Neumann <sven@gimp.org>
Merged from trunk:
* libgimpwidgets/gimpcolorprofilestore.c
(gimp_color_profile_store_load_profile): check if the file exists
before adding it to the history. Fixes bug #528958.
2008-05-05 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/unsharp-mask.c (gen_convolve_matrix): fixed
algorithm to calculate the center value. Fixes bug #530077.
2008-04-28 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/base/hue-saturation.c (hue_saturation): applied patch from
Michael Deal that fixes use of the overlap option (bug #527085).
2008-04-21 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/curve_bend.c (run): fixed handling of
"argc-lower-val-y" PDB parameter.
2008-04-16 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/config/test-config.c: initialize the units vtable in
libgimpbase instead of trying to override symbols from it.
Fixes bug #528160.
2008-04-07 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/MapObject/mapobject_main.c (query): fixed description
of 'lighttype' parameter (bug #526679).
2008-04-03 Michael Natterer <mitch@gimp.org>
Merged from trunk:
* app/core/gimpimage-convert.c (gimp_image_convert): don't accept
palettes with more than 256 colors.
* tools/pdbgen/pdb/convert.pdb: fail here too for palettes
with > 256 colors. Fixes bug #525471.
* app/pdb/convert_cmds.c: regenerated.
2008-04-03 Jordi Mallach <jordi@sindominio.net>
* configure.in (ALL_LINGUAS): Add Valencian-Catalan (ca@valencia).
2008-03-30 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
* app/widgets/gimpcontainertreeview-dnd.c
(gimp_container_tree_view_drag_drop): Make all code paths result
in a call to gtk_drag_finish() if we return TRUE. Fixes bug #317992.
2008-03-30 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/core/gimparea.c (gimp_area_list_free): don't leak the memory
allocated for the GSList.
2008-03-30 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/xcf/xcf-load.c (xcf_load_image): don't leak the grid.
2008-03-30 Sven Neumann <sven@gimp.org>
Merged Bill's changes for bug #521433 from trunk with some minor
cleanups:
* app/paint/gimpbrushcore.[ch]: made
gimp_brush_core_get_brush_mask() public.
* app/paint/gimpheal.c: respect the brush mask.
2008-03-24 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/dicom.c (dicom_loader): fixed potential crash on
empty 16 bit images.
2008-03-22 Sven Neumann <sven@gimp.org>
Merged from trunk:
* libgimp/gimppixbuf.c: fixed gtk-doc syntax.
2008-03-22 Sven Neumann <sven@gimp.org>
* app/tools/gimpcurvestool.c (gimp_curves_tool_initialize): set
the curve type to the type of the initial curve, which is SMOOTH.
Fixes bug #523873.
2008-03-13 Michael Natterer <mitch@gimp.org>
Merged from trunk:
* plug-ins/common/tiff-load.c (load_image): set the original
filename only if all pages were loaded as layers; if a subset was
loaded, set the filename to "<filename>.tiff-n-of-m-pages" so a
simple "save" won't overwrite the original file without the user
changing the filename explicitely.
2008-03-13 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/common/tiff-load.c (load_image): set a filename on the
image, even when not all images are imported as layers (bug #521436).
2008-03-12 Åsmund Skjæveland <aasmunds@ulrik.uio.no>
* configure.in: Added nn to ALL_LINGUAS.
2008-03-09 Michael Natterer <mitch@gimp.org>
Merged from trunk (slightly modified):
Fix mishandling of the "antialias" GParamSpec. Fixes bug #521069:
* app/tools/gimpselectionoptions.c (gimp_selection_options_reset):
don't set the default for "antialias" depending on the tool
type (which is impossible since the antialias GParamSpec only
exists once, and not once for each subclass).
* app/tools/gimpforegroundselectoptions.c: override the antialias
property here and default to FALSE.
2008-03-08 Sven Neumann <sven@gimp.org>
* app/about.h: reverted the last change, it breaks the string freeze.
2008-03-08 Martin Nordholts <martinn@svn.gnome.org>
* app/about.h: It's 2008 now (bug #521202).
2008-02-29 Sven Neumann <sven@gimp.org>
* configure.in: bumped version to 2.4.6 (interface age 6).
2008-02-29 Sven Neumann <sven@gimp.org>
* Made 2.4.5 release.
......
......@@ -7,6 +7,40 @@ This is the stable branch of GIMP. No new features are being added
here, just bug-fixes.
Changes in GIMP 2.4.6
=====================
- fixed handling of the "antialias" tool option (bug #521069)
- when loading a TIFF image, always set a filename on it (bug #521436)
- fixed initial state of curve type in Curves tool (bug #523873)
- fixed potential crash in the Dicom load plug-in
- respect the brush mask in the Heal tool (bug #521433)
- plugged some minor memory leaks
- fixed a glitch in the DND code (bug #317992)
- gimp-image-convert() must not accept palettes with > 256 colors (bug #525471)
- fixed parameter description in the Map Object plug-in (bug #526679)
- fixed compilation of unit tests on Mac OS X (bug #528160)
- fixed handling of "argc-lower-val-y" PDB parameter in Curve Bend plug-in
- fixed overlap problem in Hue-Saturation tool (bug #528160)
- fixed asymmetry in Unsharp Mask plug-in (bug #530077)
- don't show non-existant color profiles in the selector (bug #528958)
- fixed issues with default aspect ratio in the Crop tool (bug #532057)
- fixed compilation of the PDF import plug-in with libpoppler 0.8
- fixed bug in clipboard brush code (bug #532886)
- corrected layer mask flag in PSD save plug-in (bug #526811)
- fixed an issue with tablets and newer X.Org releases
- keep the JPEG save plug-in from writing an empty EXIF tag (bug #529469)
- fixed crash in Selective Gaussion Blur plug-in (bug #529280)
- added new translations (Belarusian, Catalan, Norwegian Nynorsk)
- translation fixes and updates
(ar, ca, de, el, es, fi, fr, hu, it, ko, pl, pt_BR, ro, sv)
Contributors:
Sven Neumann, Michael Natterer, Martin Nordholts, Bill Skaggs,
Manish Singh, Kevin Cozens, Michael Deal
Changes in GIMP 2.4.5
=====================
......
......@@ -15,8 +15,8 @@
# Owen Taylor 1997-2001
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
dnl gthread is specified in MODULES, pass to pkg-config
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
dnl gthread, or gio is specified in MODULES, pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GLIB_2_0],
[dnl
......@@ -41,6 +41,9 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
gio*)
pkg_config_args="$pkg_config_args $module-2.0"
;;
esac
done
......@@ -323,8 +326,7 @@ AC_SUBST($1)dnl
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
USE_NLS=yes
[USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
......@@ -1065,7 +1067,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
......
......@@ -172,8 +172,19 @@ hue_saturation (HueSaturation *hs,
if (use_secondary_hue)
{
r = hs->hue_transfer[hue][r] * primary_intensity +
hs->hue_transfer[secondary_hue][r] * secondary_intensity;
/* find nearest hue on the circle
* between primary and secondary hue
*/
gint diff;
diff = hs->hue_transfer[hue][r] - hs->hue_transfer[secondary_hue][r];
if (diff < -127 || diff >= 128)
r = (gint) (hs->hue_transfer[hue][r] * primary_intensity +
(hs->hue_transfer[secondary_hue][r] + 255) * secondary_intensity) % 255;
else
r = hs->hue_transfer[hue][r] * primary_intensity +
hs->hue_transfer[secondary_hue][r] * secondary_intensity;
g = hs->saturation_transfer[hue][g] * primary_intensity +
hs->saturation_transfer[secondary_hue][g] * secondary_intensity;
b = hs->lightness_transfer[hue][b] * primary_intensity +
......
......@@ -27,6 +27,7 @@
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpbase-private.h"
#include "libgimpconfig/gimpconfig.h"
#include "core/core-types.h"
......@@ -41,6 +42,8 @@ static void output_unknown_token (const gchar *key,
const gchar *value,
gpointer data);
static void units_init (void);
int
main (int argc,
......@@ -69,6 +72,8 @@ main (int argc,
g_type_init ();
units_init ();
g_print ("\nTesting GimpConfig ...\n");
g_print (" Creating a new Grid object ...");
......@@ -236,10 +241,10 @@ output_unknown_token (const gchar *key,
}
/* some dummy funcs so we can properly link this beast */
/* minimal dummy units implementation */
const gchar *
gimp_unit_get_identifier (GimpUnit unit)
static const gchar *
unit_get_identifier (GimpUnit unit)
{
switch (unit)
{
......@@ -258,8 +263,19 @@ gimp_unit_get_identifier (GimpUnit unit)
}
}
gint
gimp_unit_get_number_of_units (void)
static gint
unit_get_number_of_units (void)
{
return GIMP_UNIT_END;
}
static void
units_init (void)
{
GimpUnitVtable vtable;
vtable.unit_get_number_of_units = unit_get_number_of_units;
vtable.unit_get_identifier = unit_get_identifier;
gimp_base_init (&vtable);
}
......@@ -104,5 +104,5 @@ gimp_area_list_free (GSList *areas)
for (list = areas; list; list = list->next)
gimp_area_free (list->data);
g_slist_free (list);
g_slist_free (areas);
}
......@@ -231,7 +231,12 @@ gimp_brush_clipboard_buffer_changed (Gimp *gimp,
}
else
{
temp_buf_data_clear (brush->mask);
PixelRegion maskPR;
guchar opaque = OPAQUE_OPACITY;
pixel_region_init_temp_buf (&maskPR, brush->mask,
0, 0, width, height);
color_region (&maskPR, &opaque);
}
/* copy the color channels into the brush's pixmap */
......
......@@ -778,6 +778,8 @@ gimp_image_convert (GimpImage *image,
{
g_return_if_fail (custom_palette == NULL ||
GIMP_IS_PALETTE (custom_palette));
g_return_if_fail (custom_palette == NULL ||
custom_palette->n_colors <= 256);
if (! custom_palette)
palette_type = GIMP_MONO_PALETTE;
......
......@@ -1204,11 +1204,19 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
gimp_display_shell_autoscroll_start (shell, state, mevent);
}
/* gdk_device_get_history() has several quirks. First is
* that events with borderline timestamps at both ends
* are included. Because of that we need to add 1 to
* lower border. The second is due to poor X event
* resolution. We need to do -1 to ensure that the
* amount of events between timestamps is final or
* risk loosing some.
*/
if (gimp_tool_control_get_motion_mode (active_tool->control) ==
GIMP_MOTION_MODE_EXACT &&
gdk_device_get_history (mevent->device, mevent->window,
shell->last_motion_time,
mevent->time,
shell->last_motion_time + 1,
mevent->time - 1,
&history_events,
&n_history_events))
{
......
......@@ -108,8 +108,6 @@ static TempBuf * gimp_brush_core_scale_mask (GimpBrushCore *core,
static TempBuf * gimp_brush_core_scale_pixmap (GimpBrushCore *core,
GimpBrush *brush);
static TempBuf * gimp_brush_core_get_brush_mask (GimpBrushCore *core,
GimpBrushApplicationMode brush_hardness);
static void gimp_brush_core_invalidate_cache (GimpBrush *brush,
GimpBrushCore *core);
......@@ -1354,13 +1352,17 @@ gimp_brush_core_scale_pixmap (GimpBrushCore *core,
return core->scale_pixmap;