Commit 50c86845 authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.6.6

parent 642a129e
2009-03-16 Sven Neumann <sven@gimp.org>
* Made 2.6.6 release.
2009-03-16 Tor Lillqvist <tml@iki.fi>
* app/version.c (gimp_show_library_version): The build-time and
run-time versions were swapped in the output.
2009-03-13 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 571117 – lcms plug-in crashes on broken profile
* plug-ins/common/lcms.c: don't abort on lcms errors.
2009-03-12 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 575154 – changing the help browser preference may not work
* app/gui/gui.c (gui_restore_callback): connect to changes of the
"user-manual-online" gimprc property and kill the gimp-help
plug-in as it caches the location of the help pages.
* app/widgets/gimphelp.[ch]: added gimp_help_user_manual_changed()
for this purpose.
2009-03-12 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 573695 – 1-bit white background saved as PBM becomes all black
* plug-ins/common/file-pnm.c: look at the colormap and test which
of the two colors is black and which is white.
2009-03-12 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 573070 – crash when working with 1x3200 pixel image
* app/display/gimpdisplayshell.c (gimp_display_shell_scale_changed):
make sure that x_src_dec and y_src_dec never become zero.
2009-03-12 Sven Neumann <sven@gimp.org>
Bug 573542 – blur plugin: bug in the first line
* plug-ins/common/blur.c (blur_prepare_row): cast GimpPixelRgn.h
to a signed integer.
2009-03-11 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/file-jpeg/jpeg.h (PLUG_IN_BINARY): fixed typo.
2009-03-10 Sven Neumann <sven@gimp.org>
Bug 572403 – gimp-2.6 crashed with SIGSEGV in IA__g_object_get()
* configure.in: fixed check for newer version of GTK+ that
determines if GTK_DISABLE_DEPRECATED is used.
2009-03-07 Sven Neumann <sven@gimp.org>
Merged from trunk:
* plug-ins/file-jpeg/jpeg-load.c (load_image)
* plug-ins/file-jpeg/jpeg-save.c (save_image): need to finish the
progress update.
2009-03-05 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 573695 – 1-bit white background saved as PBM becomes all black
* plug-ins/common/file-pnm.c: need to handle the special case that
the image colormap has only one entry.
2009-03-02 Sven Neumann <sven@gimp.org>
Fix compilation with GEGL from trunk:
* app/gegl/Makefile.am
* app/geg/gegl-types.h: renamed to app/gegl/gimp-gegl-types.h
* app/core/core-types.h
* app/gegl/*.c: changed accordingly.
2009-02-28 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 573488 – Small bug in Filter>Distorts>Ripple
* plug-ins/common/ripple.c (ripple_vertical): fixed bug spotted in
SMEAR mode, pointed out by Andreas Groth.
2009-02-22 Sven Neumann <sven@gimp.org>
* app/actions/image-actions.c: reverted last change. No changes in
the stable branch without commit approval. And definitely no
string changes.
2009-02-22 Marco Ciampa <ciampix@libero.it>
* app/actions/image-actions.c: fixed duplicated keyboard shortcut
2009-02-20 Michael Natterer <mitch@gimp.org>
Merged from trunk:
Bug 572156 – top left pixel position/coordinate is not 0,0 but 1,1
* app/display/gimpstatusbar.c
(gimp_statusbar_push_coords)
(gimp_statusbar_update_cursor): fix braino for
GIMP_CURSOR_PRECISION_PIXEL_CENTER: going to the pixel's
center doesn't need any rounding, it simply needs clipping
away the coordinates' fractional parts, gah...
Review all tools' cursor precision:
* app/tools/gimpblendtool.c (gimp_blend_tool_init): set cursor
precision to SUBPIXEL.
* app/tools/gimptexttool.c (gimp_text_tool_init)
* app/tools/gimpmeasuretool.c (gimp_measure_tool_init)
* app/tools/gimpeditselectiontool.c (gimp_edit_selection_tool_init):
set cursor precision to PIXEL_BORDER.
2009-02-18 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 472644 – Rotate with clipping crops the whole layer
* app/core/gimp-transform-resize.c: applied patch as attached to
bug #472644. Supposedly fixes the problem of the disappearing
image.
2009-02-15 Sven Neumann <sven@gimp.org>
* configure.in: bumped version to 2.6.6 (interface age 6).
2009-02-15 Sven Neumann <sven@gimp.org>
* Made 2.6.5 release.
......
......@@ -404,6 +404,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = \
......
......@@ -7,6 +7,32 @@ This is the stable branch of GIMP. No new features are being added
here, just bug-fixes.
Overview of Changes from GIMP 2.6.5 to GIMP 2.6.6
=================================================
* Bugs fixed:
571117 – lcms plug-in crashes on broken profile
575154 – changing the help browser preference may not work
573542 – blur plugin: bug in the first line
572403 – gimp-2.6 crashed with SIGSEGV in IA__g_object_get()
573695 – 1-bit white background saved as PBM becomes all black
573488 – Small bug in Filter>Distorts>Ripple
572156 – top left pixel position/coordinate is not 0,0 but 1,1
472644 – Rotate with clipping crops the whole layer
* Updated translations:
German (de)
Spanish (es)
Estonian (et)
Basque (eu)
French (fr)
Italian (it)
Portuguese (pt)
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.4 to GIMP 2.6.5
=================================================
......@@ -39,7 +65,6 @@ Overview of Changes from GIMP 2.6.4 to GIMP 2.6.5
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
=================================================
......@@ -79,7 +104,6 @@ Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.2 to GIMP 2.6.3
=================================================
......@@ -115,7 +139,6 @@ Overview of Changes from GIMP 2.6.2 to GIMP 2.6.3
Romanian (ro)
Overview of Changes from GIMP 2.6.1 to GIMP 2.6.2
=================================================
......@@ -150,7 +173,6 @@ Overview of Changes from GIMP 2.6.1 to GIMP 2.6.2
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.0 to GIMP 2.6.1
=================================================
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(AC_AUTOCONF_VERSION, [2.61],,
[m4_warning([this file was generated for autoconf 2.61.
m4_if(AC_AUTOCONF_VERSION, [2.63],,
[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......
......@@ -459,6 +459,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
......
......@@ -421,6 +421,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
......
......@@ -392,6 +392,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
......
......@@ -486,6 +486,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
......
......@@ -395,6 +395,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
......
......@@ -465,6 +465,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
......
......@@ -206,7 +206,7 @@ struct _GimpCoords
};
#include "gegl/gegl-types.h"
#include "gegl/gimp-gegl-types.h"
#include "paint/paint-types.h"
#include "text/text-types.h"
#include "vectors/vectors-types.h"
......
......@@ -235,38 +235,38 @@ gimp_transform_resize_crop (gdouble dx1,
{
Point points[4];
Rectangle r;
gint ax, ay, tx, ty;
Point t,a;
gint i, j;
gint min;
/* fill in the points array */
points[0].x = floor (dx1);
points[0].y = floor (dy1);
points[1].x = floor (dx2);
points[1].y = floor (dy2);
points[2].x = floor (dx3);
points[2].y = floor (dy3);
points[3].x = floor (dx4);
points[3].y = floor (dy4);
points[0].x = dx1;
points[0].y = dy1;
points[1].x = dx2;
points[1].y = dy2;
points[2].x = dx3;
points[2].y = dy3;
points[3].x = dx4;
points[3].y = dy4;
/* first, translate the vertices into the first quadrant */
ax = 0;
ay = 0;
a.x = 0;
a.y = 0;
for (i = 0; i < 4; i++)
{
if (points[i].x < ax)
ax = points[i].x;
if (points[i].x < a.x)
a.x = points[i].x;
if (points[i].y < ay)
ay = points[i].y;
if (points[i].y < a.y)
a.y = points[i].y;
}
for (i = 0; i < 4; i++)
{
points[i].x += (-ax) * 2;
points[i].y += (-ay) * 2;
points[i].x += (-a.x) * 2;
points[i].y += (-a.y) * 2;
}
......@@ -281,14 +281,9 @@ gimp_transform_resize_crop (gdouble dx1,
min = i;
}
tx = points[0].x;
ty = points[0].y;
points[0].x = points[min].x;
points[0].y = points[min].y;
points[min].x = tx;
points[min].y = ty;
t = points[0];
points[0] = points[min];
points[min] = t;
for (i = 1; i < 4; i++)
{
......@@ -314,35 +309,22 @@ gimp_transform_resize_crop (gdouble dx1,
theta_v = theta_m;
tx = points[i].x;
ty = points[i].y;
points[i].x = points[min].x;
points[i].y = points[min].y;
points[min].x = tx;
points[min].y = ty;
t = points[i];
points[i] = points[min];
points[min] = t;
}
/* reverse the order of points */
tx = points[0].x;
ty = points[0].y;
points[0].x = points[3].x;
points[0].y = points[3].y;
points[3].x = tx;
points[3].y = ty;
tx = points[1].x;
ty = points[1].y;
t = points[0];
points[0] = points[3];
points[3] = t;
points[1].x = points[2].x;
points[1].y = points[2].y;
points[2].x = tx;
points[2].y = ty;
t = points[1];
points[1] = points[2];
points[2] = t;
r.a.x = r.a.y = r.b.x = r.b.y = r.c.x = r.c.x = r.d.x = r.d.x = r.area = 0;
r.a.x = r.a.y = r.b.x = r.b.y = r.c.x = r.c.y = r.d.x = r.d.y = r.area = 0;
r.aspect = aspect;
if (aspect != 0)
......@@ -366,10 +348,10 @@ gimp_transform_resize_crop (gdouble dx1,
*x2 = ceil (r.c.x - 0.5);
*y2 = ceil (r.c.y - 0.5);
*x1 = *x1 - ((-ax) * 2);
*y1 = *y1 - ((-ay) * 2);
*x2 = *x2 - ((-ax) * 2);
*y2 = *y2 - ((-ay) * 2);
*x1 = *x1 - ((-a.x) * 2);
*y1 = *y1 - ((-a.y) * 2);
*x2 = *x2 - ((-a.x) * 2);
*y2 = *y2 - ((-a.y) * 2);
}
......@@ -380,31 +362,31 @@ find_three_point_rectangle (Rectangle *r,
{
Point a = points[p % 4]; /* 0 1 2 3 */
Point b = points[(p + 1) % 4]; /* 1 2 3 0 */
Point c = points[(p + 2) % 4]; /* 2 3 0 2 */
Point d = points[(p + 3) % 4]; /* 3 0 1 1 */
Point c = points[(p + 2) % 4]; /* 2 3 0 1 */
Point d = points[(p + 3) % 4]; /* 3 0 1 2 */
Point i1; /* intersection point */
Point i2; /* intersection point */
Point i3; /* intersection point */
if (intersect_x (b, c, a, &i1) &&
intersect_y (c, d, i1, &i2) &&
intersect_x (d, a, i2, &i3))
if (intersect_x (b, c, a, &i1) &&
intersect_y (c, d, i1, &i2) &&
intersect_x (d, a, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i1);
if (intersect_y (b, c, a, &i1) &&
intersect_x (c, d, i1, &i2) &&
intersect_y (a, i1, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i2);
if (intersect_y (b, c, a, &i1) &&
intersect_x (c, d, i1, &i2) &&
intersect_y (d, a, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i1);
if (intersect_x (c, d, a, &i1) &&
intersect_y (b, c, i1, &i2) &&
intersect_x (a, i1, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i2);
if (intersect_x (d, c, a, &i1) &&
intersect_y (c, b, i1, &i2) &&
intersect_x (b, a, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i1);
if (intersect_y (c, d, a, &i1) &&
intersect_x (b, c, i1, &i2) &&
intersect_y (a, i1, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i2);
if (intersect_y (d, c, a, &i1) &&
intersect_x (c, b, i1, &i2) &&
intersect_y (b, a, i2, &i3))
add_rectangle (points, r, i3, i3, i1, i1);
}
static void
......
......@@ -401,6 +401,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
......
......@@ -408,6 +408,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
......
......@@ -1459,6 +1459,12 @@ gimp_display_shell_scale_changed (GimpDisplayShell *shell)
shell->y_dest_inc = gimp_image_get_height (image);
shell->x_src_dec = SCALEX (shell, gimp_image_get_width (image));
shell->y_src_dec = SCALEY (shell, gimp_image_get_height (image));
if (shell->x_src_dec < 1)
shell->x_src_dec = 1;
if (shell->y_src_dec < 1)
shell->y_src_dec = 1;
}
else
{
......
......@@ -817,8 +817,8 @@ gimp_statusbar_push_coords (GimpStatusbar *statusbar,
switch (precision)