[GRASS-SVN] r39866 - grass/trunk/lib/cairodriver

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-12-01 08:21:06 -0500 (Tue, 01 Dec 2009)
New Revision: 39866

Modified:
   grass/trunk/lib/cairodriver/Graph.c
   grass/trunk/lib/cairodriver/read_xid.c
Log:
Fix bugs preventing Pixmap re-use


Modified: grass/trunk/lib/cairodriver/Graph.c
===================================================================
--- grass/trunk/lib/cairodriver/Graph.c	2009-12-01 06:33:11 UTC (rev 39865)
+++ grass/trunk/lib/cairodriver/Graph.c	2009-12-01 13:21:06 UTC (rev 39866)
@@ -185,7 +185,7 @@
 #if CAIRO_HAS_XLIB_XRENDER_SURFACE
     if (is_xlib) {
 	if (do_read)
-	    cairo_read_image();
+	    cairo_read_xid();
 	else
 	    ca.win = 0;
 	init_xlib();

Modified: grass/trunk/lib/cairodriver/read_xid.c
===================================================================
--- grass/trunk/lib/cairodriver/read_xid.c	2009-12-01 06:33:11 UTC (rev 39865)
+++ grass/trunk/lib/cairodriver/read_xid.c	2009-12-01 13:21:06 UTC (rev 39866)
@@ -16,7 +16,7 @@
     if (!fgets(buf, sizeof(buf), fp))
 	G_fatal_error(_("Unable to read input file <%s>"), ca.file_name);
 
-    if (sscanf(buf, "%lu", &xid) != 1)
+    if (sscanf(buf, "%lx", &xid) != 1)
 	G_fatal_error(_("Unable to parse input file <%s>"), ca.file_name);
 
     fclose(fp);