[GRASS-SVN] r56027 - grass/branches/releasebranch_6_4/lib/cairodriver

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-04-28 23:28:07 -0700 (Sun, 28 Apr 2013)
New Revision: 56027

Modified:
   grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c
   grass/branches/releasebranch_6_4/lib/cairodriver/Raster.c
Log:
fixes for cairo 1.10: render rasters again (backport from trunk r44356 and r44963)

Modified: grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c	2013-04-29 06:26:14 UTC (rev 56026)
+++ grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c	2013-04-29 06:28:07 UTC (rev 56027)
@@ -49,6 +49,7 @@
     for (i = 0; i < nrows; i++)
 	memcpy(&data[i * stride], &buf[i * ncols], ncols);
 
+    cairo_surface_mark_dirty(surf);
     cairo_mask_surface(cairo, surf, cur_x, cur_y);
 
     cairo_surface_destroy(surf);

Modified: grass/branches/releasebranch_6_4/lib/cairodriver/Raster.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/cairodriver/Raster.c	2013-04-29 06:26:14 UTC (rev 56026)
+++ grass/branches/releasebranch_6_4/lib/cairodriver/Raster.c	2013-04-29 06:28:07 UTC (rev 56027)
@@ -82,6 +82,7 @@
     cairo_translate(cairo, dst_l, dst_t);
     cairo_scale(cairo, (double)dst_w / (double)src_w,
 		(double)dst_h / (double)src_h);
+    cairo_surface_mark_dirty(src_surf);
     cairo_set_source_surface(cairo, src_surf, 0, 0);
     cairo_paint(cairo);
     cairo_restore(cairo);