瀏覽代碼

r3.null: remove code which causes nulls (maybe empty tiles) to be written to the map (tested by https://trac.osgeo.org/grass/changeset/71420, see https://trac.osgeo.org/grass/ticket/2992)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71421 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 7 年之前
父節點
當前提交
d51e13e17c
共有 2 個文件被更改,包括 8 次插入14 次删除
  1. 0 6
      raster3d/r3.null/main.c
  2. 8 8
      raster3d/r3.null/testsuite/test.r3.null.sh

+ 0 - 6
raster3d/r3.null/main.c

@@ -149,12 +149,6 @@ modifyNull(char *name, d_Mask * maskRules, int changeNull, double newNullVal)
 
 		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))

+ 8 - 8
raster3d/r3.null/testsuite/test.r3.null.sh

@@ -46,14 +46,14 @@ r3.out.ascii dp=3 input=test_volume_double_null_1 output=test_volume_double_null
 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