[PATCH] mi: Fix regression in arc drawing

Aaron Plattner aplattner at nvidia.com
Fri Nov 21 08:42:55 PST 2014


On 11/11/2014 09:30 AM, Adam Jackson wrote:
> xts' XDrawArcs/15 regressed (turning into a server-side infinite loop)
> after:
>
>      commit 7679afd4da8b86aed27e5916ba723116a3c8bb4a
>      Author: Adam Jackson <ajax at redhat.com>
>      Date:   Fri Sep 26 12:01:37 2014 -0400
>
>          mi: Fold mifpolycon.c into miarc.c
>
> The reason is miarc.c provided its own definitions (sigh) of min/max,
> that both accept int arguments and return an int.  Since miFillSppPoly
> uses a double (sigh) and some min-involving math for its loop index
> variable, things do not go well.
>
> Since the integer versions of min/max are redundant, nuke 'em.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>

Reviewed-by: Aaron Plattner <aplattner at nvidia.com>

> ---
>   mi/miarc.c | 15 ---------------
>   1 file changed, 15 deletions(-)
>
> diff --git a/mi/miarc.c b/mi/miarc.c
> index 7bbe5b3..c98862c 100644
> --- a/mi/miarc.c
> +++ b/mi/miarc.c
> @@ -115,21 +115,6 @@ cbrt(double x)
>    *
>    */
>
> -#undef max
> -#undef min
> -
> -_X_INLINE static int
> -max(const int x, const int y)
> -{
> -    return x > y ? x : y;
> -}
> -
> -_X_INLINE static int
> -min(const int x, const int y)
> -{
> -    return x < y ? x : y;
> -}
> -
>   struct bound {
>       double min, max;
>   };
>


-- 
Aaron


More information about the xorg-devel mailing list