[cairo-commit] glitz/src glitz_pixel.c,1.17,1.18

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory gabe:/tmp/cvs-serv26106

Modified Files:
	glitz_pixel.c 
Log Message:
Fix pixel offset issue and add temporary workaround for problem with NPOT textures

Index: glitz_pixel.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_pixel.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- glitz_pixel.c	8 Mar 2005 07:25:08 -0000	1.17
+++ glitz_pixel.c	10 Mar 2005 22:45:30 -0000	1.18
@@ -836,8 +836,9 @@
                 }
                 
                 pixels = ptr +
-                    ((format->skip_lines + box.y1 - y_dst) * bytes_per_line) +
-                    ((format->xoffset + box.x1 - x_dst) * bytes_per_pixel);
+                    (format->skip_lines + y_dst + height - box.y2) *
+                    bytes_per_line +
+                    (format->xoffset + box.x1 - x_dst) * bytes_per_pixel;
             }
 
             gl->tex_sub_image_2d (texture->target, 0,