[GRASS-SVN] r71421 - in grass/trunk/raster3d/r3.null: . testsuite

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2017-08-19 14:47:07 -0700 (Sat, 19 Aug 2017)
New Revision: 71421

Modified:
   grass/trunk/raster3d/r3.null/main.c
   grass/trunk/raster3d/r3.null/testsuite/test.r3.null.sh
Log:
r3.null: remove code which causes nulls (maybe empty tiles) to be written to the map (tested by r71420, see #2992)

Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c	2017-08-19 21:39:59 UTC (rev 71420)
+++ grass/trunk/raster3d/r3.null/main.c	2017-08-19 21:47:07 UTC (rev 71421)
@@ -149,12 +149,6 @@
 
 		Rast3d_put_double(mapOut, x, y, z, value);
 	    }
-	if ((z % tileZ) == 0) {
-	    if (!Rast3d_flush_tiles_in_cube
-		(mapOut, 0, 0, MAX(0, z - tileZ), region.rows - 1,
-		 region.cols - 1, z))
-		Rast3d_fatal_error(_("modifyNull: error flushing tiles in cube"));
-	}
     }
 
     if (!Rast3d_flush_all_tiles(mapOut))

Modified: grass/trunk/raster3d/r3.null/testsuite/test.r3.null.sh
===================================================================
--- grass/trunk/raster3d/r3.null/testsuite/test.r3.null.sh	2017-08-19 21:39:59 UTC (rev 71420)
+++ grass/trunk/raster3d/r3.null/testsuite/test.r3.null.sh	2017-08-19 21:47:07 UTC (rev 71421)
@@ -46,14 +46,14 @@
 r3.out.ascii dp=3 input=test_volume_double_null_2 output=test_volume_double_null_2.txt
 
 # Compare
-diff test_volume_float_1.ref test_volume_float_1.txt
-diff test_volume_float_2.ref test_volume_float_2.txt
-diff test_volume_float_null_1.ref test_volume_float_null_1.txt
-diff test_volume_float_null_2.ref test_volume_float_null_2.txt
-diff test_volume_double_1.ref test_volume_double_1.txt
-diff test_volume_double_2.ref test_volume_double_2.txt
-diff test_volume_double_null_1.ref test_volume_double_null_1.txt
-diff test_volume_double_null_2.ref test_volume_double_null_2.txt
+diff data/test_volume_float_1.ref test_volume_float_1.txt
+diff data/test_volume_float_2.ref test_volume_float_2.txt
+diff data/test_volume_float_null_1.ref test_volume_float_null_1.txt
+diff data/test_volume_float_null_2.ref test_volume_float_null_2.txt
+diff data/test_volume_double_1.ref test_volume_double_1.txt
+diff data/test_volume_double_2.ref test_volume_double_2.txt
+diff data/test_volume_double_null_1.ref test_volume_double_null_1.txt
+diff data/test_volume_double_null_2.ref test_volume_double_null_2.txt
 
 # Cleanup
 g.remove -f type=raster_3d name=test_volume_float_1