瀏覽代碼

Fix segfault with -d and anull=...

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40554 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 年之前
父節點
當前提交
b285c3cb5b
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      raster/r.in.bin/main.c

+ 5 - 1
raster/r.in.bin/main.c

@@ -555,7 +555,11 @@ int main(int argc, char *argv[])
 		    cell[col] = (CELL) (unsigned int)x_i[col];
 	    }
 	    if (parm.anull->answer) {
-		if (flag.f->answer) {
+		if (flag.d->answer) {
+		    if (dcell[col] == nul_val)
+			Rast_set_d_null_value(&dcell[col], 1);
+		}
+		else if (flag.f->answer) {
 		    if (fcell[col] == (float)nul_val)
 			Rast_set_f_null_value(&fcell[col], 1);
 		}