[cairo-commit] cairo/src cairo-win32-font.c,1.48,1.49

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-win32-font.c 
Log Message:

2006-01-13  Carl Worth  <cworth at cworth.org>

        * src/cairo-win32-font.c: (_flush_glyphs): Eliminate cast of
        state->dx.elements which has been wrong since the internals of
        cairo_array_t changed on 2005-12-21. Now, hopefully less than all
        text will be broken on win32.


Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cairo-win32-font.c	22 Dec 2005 00:35:33 -0000	1.48
+++ cairo-win32-font.c	13 Jan 2006 17:25:28 -0000	1.49
@@ -894,19 +894,21 @@
     cairo_status_t status;
     int dx = 0;
     WCHAR * elements;
+    int * dx_elements;
 
     status = _cairo_array_append (&state->dx, &dx);
     if (status)
 	return status;
     
     elements = _cairo_array_index (&state->glyphs, 0);
+    dx_elements = _cairo_array_index (&state->dx, 0);
     if (!ExtTextOutW (state->hdc,
 		      state->start_x, state->last_y,
 		      ETO_GLYPH_INDEX,
 		      NULL,
 		      elements,
 		      state->glyphs.num_elements,
-		      (int *)state->dx.elements)) {
+		      dx_elements)) {
 	return _cairo_win32_print_gdi_error ("_flush_glyphs");
     }