/[gentoo-x86]/x11-libs/cairo/files/cairo-1.10.2-interix.patch
Gentoo

Contents of /x11-libs/cairo/files/cairo-1.10.2-interix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Wed Jul 13 09:05:48 2011 UTC (3 years, 3 months ago) by mduft
Branch: MAIN
CVS Tags: HEAD
added patch required for interix prefix build - upstream committed already.

(Portage version: 2.1.10.3/cvs/Linux i686)

1 commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa
2 Author: Uli Schlachter <psychon@znc.in>
3 Date: Fri Oct 22 11:54:57 2010 +0200
4
5 Make both versions of _cairo_lround consistent again
6
7 Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround
8 by default. However, since commit ce58f874 from 2006, _cairo_lround does
9 arithmetic rounding instead of away-from-zero rounding (before said commit, it
10 was using baker's rounding).
11
12 So to make the rounding of _cairo_lround be independent from
13 DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that
14 _cairo_round already does the same thing that _cairo_lround does. Their only
15 difference is the return type.
16
17 Signed-off-by: Uli Schlachter <psychon@znc.in>
18 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
19
20 diff --git a/src/cairoint.h b/src/cairoint.h
21 index 53c87e5..539d92e 100644
22 --- a/src/cairoint.h
23 +++ b/src/cairoint.h
24 @@ -968,7 +968,11 @@ _cairo_round (double r)
25 cairo_private int
26 _cairo_lround (double d) cairo_const;
27 #else
28 -#define _cairo_lround lround
29 +static inline int cairo_const
30 +_cairo_lround (double r)
31 +{
32 + return _cairo_round (r);
33 +}
34 #endif
35
36 cairo_private uint16_t

  ViewVC Help
Powered by ViewVC 1.1.20