[GRASS-SVN] r40492 - grass/trunk/lib/raster

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-01-17 04:50:13 -0500 (Sun, 17 Jan 2010)
New Revision: 40492

Modified:
   grass/trunk/lib/raster/put_row.c
Log:
Fix warnings


Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c	2010-01-17 05:49:21 UTC (rev 40491)
+++ grass/trunk/lib/raster/put_row.c	2010-01-17 09:50:13 UTC (rev 40492)
@@ -188,7 +188,7 @@
     struct fileinfo *fcb = &R__.fileinfo[fd];
     int compressed = (fcb->open_mode == OPEN_NEW_COMPRESSED);
     XDR *xdrs = &fcb->xdrstream;
-    char *work_buf;
+    void *work_buf;
 
     if (row < 0 || row >= fcb->cellhd.rows)
 	return;
@@ -455,8 +455,8 @@
     dst = work_buf;
 
     for (i = 0; i < n; i++) {
-	if (Rast_is_null_value(src, map_type) || zeros_r_nulls &&
-	    !*(CELL *) src)
+	if (Rast_is_null_value(src, map_type) ||
+	    (zeros_r_nulls && !*(CELL *) src))
 	    Rast_set_d_value(dst, null_val, map_type);
 	else
 	    memcpy(dst, src, size);