[cairo-commit] cairo/test cairo-test.c, 1.55.2.2, 1.55.2.3 create-from-png-stream.c, 1.1, 1.1.4.1 nil-surface.c, 1.2, 1.2.2.1

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv3159/test

Modified Files:
      Tag: BRANCH_1_0
	cairo-test.c create-from-png-stream.c nil-surface.c 
Log Message:

2005-09-26  Carl Worth  <cworth at cworth.org>

        Backported from HEAD:
        2005-08-31  Owen Taylor  <otaylor at 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.


Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.55.2.2
retrieving revision 1.55.2.3
diff -u -d -r1.55.2.2 -r1.55.2.3
--- cairo-test.c	13 Sep 2005 19:20:15 -0000	1.55.2.2
+++ cairo-test.c	26 Sep 2005 22:43:17 -0000	1.55.2.3
@@ -35,7 +35,9 @@
 #endif
 #include <errno.h>
 #include <string.h>
+#if HAVE_FCFINI
 #include <fontconfig/fontconfig.h>
+#endif
 
 #include "cairo-test.h"
 

Index: create-from-png-stream.c
===================================================================
RCS file: /cvs/cairo/cairo/test/create-from-png-stream.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- create-from-png-stream.c	27 Jul 2005 16:23:29 -0000	1.1
+++ create-from-png-stream.c	26 Sep 2005 22:43:17 -0000	1.1.4.1
@@ -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 @@
     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;

Index: nil-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/test/nil-surface.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- nil-surface.c	19 Aug 2005 14:39:48 -0000	1.2
+++ nil-surface.c	26 Sep 2005 22:43:17 -0000	1.2.2.1
@@ -24,7 +24,7 @@
  */
 
 #include "cairo-test.h"
-#include <cairo-ft.h>
+#include <stddef.h>
 
 /* Test to verify fixes for the following similar bugs:
  *