Attachment 25044 Details for Bug 16560 – wrong but good enough patch

[patch] wrong but good enough patch

pixman-0.14.0-sample.patch (text/plain), 1.03 KB, created by Adam Jackson on 2009-04-22 12:57:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2009-04-22 12:57:25 UTC

Size: 1.03 KB

patch

obsolete

>diff -up pixman-0.14.0/pixman/pixman-utils.c.jx pixman-0.14.0/pixman/pixman-utils.c
>--- pixman-0.14.0/pixman/pixman-utils.c.jx	2009-02-06 15:33:46.000000000 -0500
>+++ pixman-0.14.0/pixman/pixman-utils.c	2009-04-22 14:04:35.000000000 -0400
>@@ -201,8 +201,13 @@ pixman_sample_ceil_y (pixman_fixed_t y, 
>     f = ((f + Y_FRAC_FIRST(n)) / STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n);
>     if (f > Y_FRAC_LAST(n))
>     {
>-	f = Y_FRAC_FIRST(n);
>-	i += pixman_fixed_1;
>+	if (pixman_fixed_to_int(i) == 0x7fff)
>+	{
>+	    f = 0xffff; /* saturate */
>+	} else {
>+	    f = Y_FRAC_FIRST(n);
>+	    i += pixman_fixed_1;
>+	}
>     }
>     return (i | f);
> }
>@@ -222,8 +227,13 @@ pixman_sample_floor_y (pixman_fixed_t y,
>     f = _div(f - Y_FRAC_FIRST(n), STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n);
>     if (f < Y_FRAC_FIRST(n))
>     {
>-	f = Y_FRAC_LAST(n);
>-	i -= pixman_fixed_1;
>+	if (pixman_fixed_to_int(i) == 0x8000)
>+	{
>+	    f = 0; /* saturate */
>+	} else {
>+	    f = Y_FRAC_LAST(n);
>+	    i -= pixman_fixed_1;
>+	}
>     }
>     return (i | f);
> }

Actions: View | Splinter Review

Attachments on bug 16560: 22507 | 25044 | 25045

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.