frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: Fix regression in arc drawing 

xts' XDrawArcs/15 regressed (turning into a server-side infinite loop)
after:

    commit 7679afd4da
    Author: Adam Jackson <ajax@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@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2014-11-11 12:30:07 -05:00 committed by Keith Packard
parent ec0ac8970b
commit c52a2b1eba
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mi/miarc.c
View File

@ -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 { struct bound {
double min, max; double min, max;
}; };