From 55b765064de10fd49f4ea5df29e38e7d8329e570 Mon Sep 17 00:00:00 2001
From: Jorn Baayen <jorn@openedhand.com>
Date: Fri, 25 Aug 2006 10:14:14 +0000
Subject: Added faster cairo_fixed_from_double()

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@638 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/cairo/cairo_1.2.0.bb          | 15 ----------
 meta/packages/cairo/cairo_1.2.4.bb          | 16 +++++++++++
 meta/packages/cairo/files/cairo-fixed.patch | 43 +++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 15 deletions(-)
 delete mode 100644 meta/packages/cairo/cairo_1.2.0.bb
 create mode 100644 meta/packages/cairo/cairo_1.2.4.bb
 create mode 100644 meta/packages/cairo/files/cairo-fixed.patch

diff --git a/meta/packages/cairo/cairo_1.2.0.bb b/meta/packages/cairo/cairo_1.2.0.bb
deleted file mode 100644
index 10603e3f2..000000000
--- a/meta/packages/cairo/cairo_1.2.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r1"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/meta/packages/cairo/cairo_1.2.4.bb b/meta/packages/cairo/cairo_1.2.4.bb
new file mode 100644
index 000000000..bad6da8bd
--- /dev/null
+++ b/meta/packages/cairo/cairo_1.2.4.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "libx11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://cairo-fixed.patch;patch=1"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/meta/packages/cairo/files/cairo-fixed.patch b/meta/packages/cairo/files/cairo-fixed.patch
new file mode 100644
index 000000000..8df54d9cb
--- /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);
-- 
cgit v1.2.3