dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

further tweaks. now excluding fractions where numerator*denominator > 200 

2004-01-11  Simon Budig  <simon@gimp.org>

	* app/display/gimpdisplayshell-scale.c: further tweaks.
	now excluding fractions where numerator*denominator > 200
	(only when both are > 1).
	This is a simple heuristic to exclude some absurd looking
	fractions.

	Also ensure that 1/ratio results in b:a, when ratio results
	in a:b.

	IMHO fixes bug #124073.
This commit is contained in:
Simon Budig 2004-01-11 00:28:38 +00:00 committed by Simon Budig
parent 8c32fa9b6d
commit 17059086de
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,4 +1,17 @@
2004-01-10 Sven Neumann <sven@gimp.org>
2004-01-11 Simon Budig <simon@gimp.org>
* app/display/gimpdisplayshell-scale.c: further tweaks.
now excluding fractions where numerator*denominator > 200
(only when both are > 1).
This is a simple heuristic to exclude some absurd looking
fractions.
Also ensure that 1/ratio results in b:a, when ratio results
in a:b.
IMHO fixes bug #124073.
2004-01-11 Sven Neumann <sven@gimp.org>
* app/core/gimpimagefile.[ch] (gimp_imagefile_update): removed the
size parameter and do nothing but invalidating the preview.

29
app/display/gimpdisplayshell-scale.c
View File

@ -105,13 +105,21 @@ gimp_display_shell_scale_calc_fraction (gdouble zoom_factor,
gint *scalesrc,
gint *scaledest)
{
gint p0, p1, p2;
gint q0, q1, q2;
gdouble remainder, next_cf;
gint p0, p1, p2;
gint q0, q1, q2;
gdouble remainder, next_cf;
gboolean swapped = FALSE;
g_return_if_fail (scalesrc != NULL);
g_return_if_fail (scaledest != NULL);
/* make sure that zooming behaves symmetrically */
if (zoom_factor < 1.0)
{
zoom_factor = 1.0 / zoom_factor;
swapped = TRUE;
}
/* calculate the continued fraction for the desired zoom factor */
p0 = 1;
@ -132,7 +140,8 @@ gimp_display_shell_scale_calc_fraction (gdouble zoom_factor,
q2 = next_cf * q1 + q0;
/* Numerator and Denominator are limited by 255 */
if (p2 > 255 || q2 > 255)
/* also absurd ratios like 170:171 are excluded */
if (p2 > 255 || q2 > 255 || (p2 > 1 && q2 > 1 && p2 * q2 > 200))
break;
/* remember the last two fractions */
@ -159,8 +168,16 @@ gimp_display_shell_scale_calc_fraction (gdouble zoom_factor,
q1 = 255;
}
*scalesrc = q1;
*scaledest = p1;
if (swapped)
{
*scalesrc = p1;
*scaledest = q1;
}
else
{
*scalesrc = q1;
*scaledest = p1;
}
}
void