diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | test/cairo-test.c | 2 | ||||
| -rw-r--r-- | test/create-from-png-stream.c | 6 | ||||
| -rw-r--r-- | test/nil-surface.c | 2 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,17 @@ +2005-09-26 Carl Worth <cworth@cworth.org> + + Backported from HEAD: + 2005-08-31 Owen Taylor <otaylor@redhat.com> + + * test/cairo-test.c: Protect inclusion of fontconfig.h + with HAVE_FCFINI. + + * test/nil-surface.c: Remove stray cairo-ft.h include. + + * test/nil-surface.c: Include stddef.h for NULL. + + * test/create-from-png-stream.c (draw): Open the file "rb". + 2005-09-26 Tor Lillqvist <tml@novell.com> * src/cairo-win32-font.c (_win32_scaled_font_get_scaled_hfont), diff --git a/test/cairo-test.c b/test/cairo-test.c index 15bc7e476..029002bc0 100644 --- a/test/cairo-test.c +++ b/test/cairo-test.c @@ -35,7 +35,9 @@ #endif #include <errno.h> #include <string.h> +#if HAVE_FCFINI #include <fontconfig/fontconfig.h> +#endif #include "cairo-test.h" diff --git a/test/create-from-png-stream.c b/test/create-from-png-stream.c index 75c70a563..e4bcda80d 100644 --- a/test/create-from-png-stream.c +++ b/test/create-from-png-stream.c @@ -32,8 +32,8 @@ #define HEIGHT 2 cairo_test_t test = { - "create-from-png", - "Tests the creation of an image surface from a PNG file", + "create-from-png-stream", + "Tests the creation of an image surface from a PNG using a FILE *", WIDTH, HEIGHT }; @@ -61,7 +61,7 @@ draw (cairo_t *cr, int width, int height) xasprintf (&filename, "%s/%s", srcdir ? srcdir : ".", "create-from-png-stream-ref.png"); - file = fopen (filename, "r"); + file = fopen (filename, "rb"); if (file == NULL) { cairo_test_log ("Error: failed to open file: %s\n", filename); return CAIRO_TEST_FAILURE; diff --git a/test/nil-surface.c b/test/nil-surface.c index b1e83d4b4..ba2a59744 100644 --- a/test/nil-surface.c +++ b/test/nil-surface.c @@ -24,7 +24,7 @@ */ #include "cairo-test.h" -#include <cairo-ft.h> +#include <stddef.h> /* Test to verify fixes for the following similar bugs: * |