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

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-12-18 16:46:20 -0800 (Sat, 18 Dec 2010)
New Revision: 44628

Modified:
   grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c
Log:
backport cairo driver fixes from devbr6 r43698 (#1152; untested)

Modified: grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c	2010-12-17 15:17:21 UTC (rev 44627)
+++ grass/branches/releasebranch_6_4/lib/cairodriver/Draw_bitmap.c	2010-12-19 00:46:20 UTC (rev 44628)
@@ -1,44 +1,53 @@
-#include "cairodriver.h"
+/*!
+  \file cairodriver/Draw_bitmap.c
 
-static cairo_surface_t *fix_surface(cairo_surface_t * src)
-{
-    int width = cairo_image_surface_get_width(src);
-    int height = cairo_image_surface_get_height(src);
-    int stride = cairo_image_surface_get_stride(src);
-    cairo_format_t format = cairo_image_surface_get_format(src);
-    unsigned char *data = cairo_image_surface_get_data(src);
-    cairo_surface_t *dst = cairo_image_surface_create(format, width, height);
-    int stride2 = cairo_image_surface_get_stride(dst);
-    unsigned char *data2 = cairo_image_surface_get_data(dst);
-    int i;
+  \brief GRASS cairo display driver - draw bitmap
 
-    for (i = 0; i < height; i++) {
-	void *p = data + i * stride;
-	void *q = data2 + i * stride2;
-	int n = stride < stride2 ? stride : stride2;
+  (C) 2007-2010 by Lars Ahlzen and the GRASS Development Team
+  
+  This program is free software under the GNU General Public License
+  (>=v2). Read the file COPYING that comes with GRASS for details.
+  
+  \author Lars Ahlzen <lars ahlzen.com> (original contibutor)
+  \author Glynn Clements  
+*/
 
-	memcpy(q, p, n);
-    }
+#include <grass/glocale.h>
 
-    cairo_surface_destroy(src);
-    return dst;
-}
+#include "cairodriver.h"
 
+/*!
+  \brief Draw bitmap
+
+  \param ncols,nrows number of columns and rows
+  \param threshold threshold value
+  \param buf data buffer
+*/
 void Cairo_draw_bitmap(int ncols, int nrows, int threshold,
 		       const unsigned char *buf)
 {
     cairo_surface_t *surf;
+    int stride;
+    unsigned char *data;
+    int i;
 
     G_debug(1, "Cairo_draw_bitmap: %d %d %d", ncols, nrows, threshold);
 
-    surf = cairo_image_surface_create_for_data((unsigned char *)buf,
-					       CAIRO_FORMAT_A8, ncols, nrows,
-					       ncols);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,5,8)
+    stride = cairo_format_stride_for_width(CAIRO_FORMAT_A8, ncols);
+#else
+#define MULTIPLE 4
+    stride = (ncols + (MULTIPLE - 1)) / MULTIPLE * MULTIPLE;
+#endif
+    data = malloc(stride * nrows);
+    surf = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_A8, ncols,
+					       nrows, stride);
 
     if (cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS)
-	G_fatal_error("Cairo_draw_bitmap: Failed to create source");
+	G_fatal_error(_("Cairo_draw_bitmap: Failed to create source"));
 
-    surf = fix_surface(surf);
+    for (i = 0; i < nrows; i++)
+	memcpy(&data[i * stride], &buf[i * ncols], ncols);
 
     cairo_mask_surface(cairo, surf, cur_x, cur_y);