mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
Added faster cairo_fixed_from_double()
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@638 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -6,7 +6,8 @@ DESCRIPTION = "Cairo graphics library"
|
|||||||
LICENSE = "MPL LGPL"
|
LICENSE = "MPL LGPL"
|
||||||
PR = "r1"
|
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
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
43
meta/packages/cairo/files/cairo-fixed.patch
Normal file
43
meta/packages/cairo/files/cairo-fixed.patch
Normal file
@@ -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);
|
||||||
Reference in New Issue
Block a user