[cairo-commit] cairo/test Makefile.am, 1.24, 1.25 move-to-show-surface.c, 1.3, 1.4 testsvg, 1.1, 1.2

[Carl Worth]

Committed by: cworth

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

Modified Files:
	Makefile.am move-to-show-surface.c testsvg 
Log Message:

        * src/cairo-gstate.c: (_cairo_gstate_show_surface): Use the
        current point to offset just the destination, not the source and
        destination. With this fix, cairo_show_surface should work with
        the current point at places other than the origin.

        * test/Makefile.am: Move move-to-show-surface off the expected
        failure list.

        * test/move-to-show-surface.c: Add comment indicating that bug is
        resolved.

        * test/testsvg: Don't use diff to compare images, just imagediff.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	29 Mar 2005 08:02:19 -0000	1.24
+++ Makefile.am	2 Apr 2005 14:00:32 -0000	1.25
@@ -41,7 +41,6 @@
 # regression bugs that should not be listed here. Instead they should
 # be fixed before the code is committed.
 XFAIL_TESTS =		\
-move-to-show-surface	\
 pixman-rotate		\
 text-rotate
 

Index: move-to-show-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/test/move-to-show-surface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- move-to-show-surface.c	29 Mar 2005 08:02:19 -0000	1.3
+++ move-to-show-surface.c	2 Apr 2005 14:00:32 -0000	1.4
@@ -32,6 +32,15 @@
  *   bit of poking around suggests this isn't a regression, (at least
  *   not since the last pixman snapshot).
  *
+ * 2005-04-02  Carl Worth <cworth at cworth.org>
+ *
+ *   Status: RESOLVED
+ *
+ *   Inside cairo_show_surface the current point was being used as
+ *   both source and destination offsets. After fixing that to use 0,0
+ *   as the source offset and the current point as the destination
+ *   offset, the bug seems to be gone.
+ *
  */
 
 

Index: testsvg
===================================================================
RCS file: /cvs/cairo/cairo/test/testsvg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- testsvg	15 Feb 2005 23:07:25 -0000	1.1
+++ testsvg	2 Apr 2005 14:00:32 -0000	1.2
@@ -27,11 +27,11 @@
 #	if xsvg $svg -p $outpng ; then
 	if svg2png $svg $outpng ; then
 		if [ -e $refpng ]; then
-			if diff $refpng $outpng > /dev/null; then
+			if $IMAGEDIFF $refpng $outpng > $diffpng; then
 				echo "Rendering of $svg matches." >&2
+				rm -f $diffpng
 			else
 				echo "ERROR: Rendering of $svg differs from reference image." >&2
-				$IMAGEDIFF $refpng $outpng > $diffpng
 				echo $refpng $outpng $diffpng >> $IMAGELIST
 				err=$(($err+1))
 			fi