summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-09-12 11:11:48 +0000
committerCarl Worth <cworth@cworth.org>2005-09-12 11:11:48 +0000
commitec413ca3a4fc3c76fd2a395f2c0f4867efb0522f (patch)
treeeaa8ad8542b9d2ddbc8784b7d4f0ff37df588c58
parentb9809741dd1eaf8ca1f1dbc09fb3938b5ccf471f (diff)
Fix for bug #4401 as reported by Tim Mooney:
Don't bother checking for sincos function. Don't use sincos function since it is apparently buggy on some platforms, (Tru64 at least).
-rw-r--r--ChangeLog10
-rw-r--r--configure.in4
-rw-r--r--src/cairo-matrix.c6
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ac6f2ad0..0986d46d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-12 Carl Worth <cworth@cworth.org>
+
+ Fix for bug #4401 as reported by Tim Mooney:
+
+ * configure.in: Don't bother checking for sincos function.
+
+ * src/cairo-matrix.c: (cairo_matrix_init_rotate): Don't use sincos
+ function since it is apparently buggy on some platforms, (Tru64 at
+ least).
+
2005-09-01 Carl Worth <cworth@cworth.org>
* test/cairo-test.h: Add includes to get sized-integer types such
diff --git a/configure.in b/configure.in
index ea92be078..0bf08ea8e 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREREQ(2.54)
# An odd micro number indicates in-progress development, (eg. from CVS)
# An even micro number indicates a released version.
m4_define(cairo_version_major, 1)
-m4_define(cairo_version_minor, 1)
+m4_define(cairo_version_minor, 0)
m4_define(cairo_version_micro, 1)
AC_INIT([cairo],
@@ -81,8 +81,6 @@ AC_CHECK_LIBM
LIBS="$LIBS $LIBM"
-AC_CHECK_FUNCS(sincos)
-
dnl ===========================================================================
AC_ARG_ENABLE(xlib,
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index 4073ea4eb..d75fc2100 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -229,12 +229,10 @@ cairo_matrix_init_rotate (cairo_matrix_t *matrix,
{
double s;
double c;
-#if HAVE_SINCOS
- sincos (radians, &s, &c);
-#else
+
s = sin (radians);
c = cos (radians);
-#endif
+
cairo_matrix_init (matrix,
c, s,
-s, c,