[cairo-commit] cairo/test cairo-test.h, 1.13, 1.13.4.1 filter-nearest-offset.c, 1.2, 1.2.2.1 mask-ctm.c, 1.1, 1.1.4.1 mask-surface-ctm.c, 1.1, 1.1.4.1 move-to-show-surface.c, 1.8, 1.8.4.1 paint-with-alpha.c, 1.1, 1.1.4.1 scale-source-surface-paint.c, 1.2, 1.2.4.1 set-source.c, 1.3, 1.3.4.1 source-surface-scale-paint.c, 1.3, 1.3.4.1 translate-show-surface.c, 1.4, 1.4.4.1

Carl Worth commit at pdx.freedesktop.org
Thu Sep 1 02:17:39 PDT 2005


Committed by: cworth

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

Modified Files:
      Tag: BRANCH_1_0
	cairo-test.h filter-nearest-offset.c mask-ctm.c 
	mask-surface-ctm.c move-to-show-surface.c paint-with-alpha.c 
	scale-source-surface-paint.c set-source.c 
	source-surface-scale-paint.c translate-show-surface.c 
Log Message:

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

        * test/cairo-test.h: Add includes to get sized-integers types such
        as uint32_t.

        * test/filter-nearest-offset.c: (draw):
        * test/mask-ctm.c: (draw):
        * test/mask-surface-ctm.c: (draw):
        * test/move-to-show-surface.c: (draw):
        * test/paint-with-alpha.c: (draw):
        * test/scale-source-surface-paint.c: (draw):
        * test/set-source.c: (draw):
        * test/source-surface-scale-paint.c: (draw):
        * test/translate-show-surface.c: (draw): Fix declaration of image
        data array to be uint32_t rather than unsigned long. Fixes four
        out of the remaining five failures in bug #4245.


Index: cairo-test.h
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.h,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -d -r1.13 -r1.13.4.1
--- cairo-test.h	1 Aug 2005 20:33:47 -0000	1.13
+++ cairo-test.h	1 Sep 2005 09:17:37 -0000	1.13.4.1
@@ -26,10 +26,36 @@
 #ifndef _CAIRO_TEST_H_
 #define _CAIRO_TEST_H_
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <cairo.h>
 #include <cairo-debug.h>
 
+#if   HAVE_STDINT_H
+# include <stdint.h>
+#elif HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif HAVE_SYS_INT_TYPES_H
+# include <sys/int_types.h>
+#elif defined(_MSC_VER)
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+# ifndef HAVE_UINT64_T
+#  define HAVE_UINT64_T 1
+# endif
+#else
+#error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, \etc.)
+#endif
+
 typedef enum cairo_test_status {
     CAIRO_TEST_SUCCESS = 0,
     CAIRO_TEST_FAILURE,

Index: filter-nearest-offset.c
===================================================================
RCS file: /cvs/cairo/cairo/test/filter-nearest-offset.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- filter-nearest-offset.c	17 Aug 2005 04:04:02 -0000	1.2
+++ filter-nearest-offset.c	1 Sep 2005 09:17:37 -0000	1.2.2.1
@@ -44,7 +44,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long data[STAMP_WIDTH * STAMP_HEIGHT] = {
+    uint32_t data[STAMP_WIDTH * STAMP_HEIGHT] = {
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 

Index: mask-ctm.c
===================================================================
RCS file: /cvs/cairo/cairo/test/mask-ctm.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- mask-ctm.c	28 Jul 2005 22:55:01 -0000	1.1
+++ mask-ctm.c	1 Sep 2005 09:17:37 -0000	1.1.4.1
@@ -36,7 +36,7 @@
 {
     cairo_surface_t *mask_surface;
     cairo_pattern_t *mask;
-    unsigned long data[] = {
+    uint32_t data[] = {
 	0x80000000, 0x80000000,
 	0x80000000, 0x80000000,
     };

Index: mask-surface-ctm.c
===================================================================
RCS file: /cvs/cairo/cairo/test/mask-surface-ctm.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- mask-surface-ctm.c	28 Jul 2005 22:55:01 -0000	1.1
+++ mask-surface-ctm.c	1 Sep 2005 09:17:37 -0000	1.1.4.1
@@ -35,7 +35,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *mask;
-    unsigned long data[] = {
+    uint32_t data[] = {
 	0x80000000, 0x80000000,
 	0x80000000, 0x80000000,
     };

Index: move-to-show-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/test/move-to-show-surface.c,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- move-to-show-surface.c	6 May 2005 20:32:53 -0000	1.8
+++ move-to-show-surface.c	1 Sep 2005 09:17:37 -0000	1.8.4.1
@@ -55,7 +55,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long colors[4] = {
+    uint32_t colors[4] = {
 	0xffffffff, 0xffff0000,
 	0xff00ff00, 0xff0000ff
     };

Index: paint-with-alpha.c
===================================================================
RCS file: /cvs/cairo/cairo/test/paint-with-alpha.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- paint-with-alpha.c	12 May 2005 18:02:35 -0000	1.1
+++ paint-with-alpha.c	1 Sep 2005 09:17:37 -0000	1.1.4.1
@@ -35,7 +35,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long data[16] = {
+    uint32_t data[16] = {
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 

Index: scale-source-surface-paint.c
===================================================================
RCS file: /cvs/cairo/cairo/test/scale-source-surface-paint.c,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- scale-source-surface-paint.c	6 May 2005 20:23:41 -0000	1.2
+++ scale-source-surface-paint.c	1 Sep 2005 09:17:37 -0000	1.2.4.1
@@ -35,7 +35,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long data[16] = {
+    uint32_t data[16] = {
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 

Index: set-source.c
===================================================================
RCS file: /cvs/cairo/cairo/test/set-source.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- set-source.c	6 May 2005 20:32:53 -0000	1.3
+++ set-source.c	1 Sep 2005 09:17:37 -0000	1.3.4.1
@@ -37,7 +37,7 @@
     int i;
     /* This color value might need to change in the future when we fix
      * the rounding in cairo-color.c */
-    unsigned long color = 0x7f19334C;
+    uint32_t color = 0x7f19334C;
     cairo_surface_t *surface;
     cairo_pattern_t *pattern;
 

Index: source-surface-scale-paint.c
===================================================================
RCS file: /cvs/cairo/cairo/test/source-surface-scale-paint.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- source-surface-scale-paint.c	1 Aug 2005 21:39:01 -0000	1.3
+++ source-surface-scale-paint.c	1 Sep 2005 09:17:37 -0000	1.3.4.1
@@ -35,7 +35,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long data[16] = {
+    uint32_t data[16] = {
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 	0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
 

Index: translate-show-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/test/translate-show-surface.c,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- translate-show-surface.c	6 May 2005 20:32:53 -0000	1.4
+++ translate-show-surface.c	1 Sep 2005 09:17:37 -0000	1.4.4.1
@@ -53,7 +53,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    unsigned long colors[4] = {
+    uint32_t colors[4] = {
 	0xffffffff, 0xffff0000,
 	0xff00ff00, 0xff0000ff
     };



More information about the cairo-commit mailing list