diff options
| author | Jorn Baayen <jorn@openedhand.com> | 2006-08-25 10:14:14 +0000 |
|---|---|---|
| committer | Jorn Baayen <jorn@openedhand.com> | 2006-08-25 10:14:14 +0000 |
| commit | 55b765064de10fd49f4ea5df29e38e7d8329e570 (patch) | |
| tree | 9dfe3fd55db0bed9ab281788f9a2402366e19672 | |
| parent | ad1b593155e92f3c8ef381c0dee089983bb748c7 (diff) | |
| download | openembedded-core-55b765064de10fd49f4ea5df29e38e7d8329e570.tar.gz openembedded-core-55b765064de10fd49f4ea5df29e38e7d8329e570.tar.bz2 openembedded-core-55b765064de10fd49f4ea5df29e38e7d8329e570.zip | |
Added faster cairo_fixed_from_double()
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@638 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/cairo/cairo_1.2.4.bb (renamed from meta/packages/cairo/cairo_1.2.0.bb) | 3 | ||||
| -rw-r--r-- | meta/packages/cairo/files/cairo-fixed.patch | 43 |
2 files changed, 45 insertions, 1 deletions
diff --git a/meta/packages/cairo/cairo_1.2.0.bb b/meta/packages/cairo/cairo_1.2.4.bb index 10603e3f2f..bad6da8bde 100644 --- a/meta/packages/cairo/cairo_1.2.0.bb +++ b/meta/packages/cairo/cairo_1.2.4.bb @@ -6,7 +6,8 @@ DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://cairo-fixed.patch;patch=1" inherit autotools pkgconfig diff --git a/meta/packages/cairo/files/cairo-fixed.patch b/meta/packages/cairo/files/cairo-fixed.patch new file mode 100644 index 0000000000..8df54d9cb5 --- /dev/null +++ b/meta/packages/cairo/files/cairo-fixed.patch @@ -0,0 +1,43 @@ +diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c +--- cairo-1.2.4/src/cairo-fixed.c 2006-06-10 07:07:37.000000000 +0300 ++++ cairo-1.2.4-new/src/cairo-fixed.c 2006-08-25 13:06:26.000000000 +0300 +@@ -43,12 +43,6 @@ + } + + cairo_fixed_t +-_cairo_fixed_from_double (double d) +-{ +- return (cairo_fixed_t) floor (d * 65536 + 0.5); +-} +- +-cairo_fixed_t + _cairo_fixed_from_26_6 (uint32_t i) + { + return i << 10; +diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h +--- cairo-1.2.4/src/cairoint.h 2006-08-18 17:20:16.000000000 +0300 ++++ cairo-1.2.4-new/src/cairoint.h 2006-08-25 13:14:07.000000000 +0300 +@@ -1117,8 +1117,21 @@ + + #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1) + +-cairo_private cairo_fixed_t +-_cairo_fixed_from_double (double d); ++#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */ ++ ++#ifdef WORDS_BIGENDIAN ++#define iman 1 ++#else ++#define iman 0 ++#endif ++ ++static inline cairo_fixed_t ++_cairo_fixed_from_double (double d) ++{ ++ d = d + CAIRO_DOUBLE2FIX_MAGIC; ++ ++ return ((cairo_fixed_t *) &d)[iman]; ++} + + cairo_private cairo_fixed_t + _cairo_fixed_from_26_6 (uint32_t i); |