[GRASS-SVN] r70338 - grass/trunk/raster/r.null

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-01-11 01:30:53 -0800 (Wed, 11 Jan 2017)
New Revision: 70338

Modified:
   grass/trunk/raster/r.null/main.c
Log:
r.null: fix recreate and remove NULL file

Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c	2017-01-11 09:24:59 UTC (rev 70337)
+++ grass/trunk/raster/r.null/main.c	2017-01-11 09:30:53 UTC (rev 70338)
@@ -196,8 +196,26 @@
     }
 
     if (recreate) {
+	/* (un-)compress NULL file */
 	int in_fd;
-	/* write a file of no-nulls */
+	char *nullcompr = getenv("GRASS_COMPRESS_NULLS");
+        int donullcompr = (nullcompr && atoi(nullcompr)) ? 1 : 0;
+
+	G_debug(1, "NULL compression is currently %s", donullcompr ? "enabled" : "disabled");
+
+	if (donullcompr) {
+	    if (G_find_file2_misc("cell_misc", "nullcmpr", name, mapset)) {
+		G_message(_("The NULL file is already compressed, nothing to do."));
+		exit(EXIT_SUCCESS);
+	    }
+	}
+	else {
+	    if (G_find_file2_misc("cell_misc", "null", name, mapset)) {
+		G_message(_("The NULL file is already uncompressed, nothing to do."));
+		exit(EXIT_SUCCESS);
+	    }
+	}
+
 	null_bits = Rast__allocate_null_bits(cellhd.cols);
 	Rast__init_null_bits(null_bits, cellhd.cols);
 
@@ -223,12 +241,12 @@
     }
 
     if (remove) {
-	/* write a file of no-nulls */
+	/* remove NULL file */
 	G_verbose_message(_("Removing null file for raster map <%s>..."),
 			   name);
 	G_file_name_misc(path, "cell_misc", "null", name, mapset);
 	unlink(path);
-	G_file_name_misc(path, "cell_misc", "null2", name, mapset);
+	G_file_name_misc(path, "cell_misc", "nullcmpr", name, mapset);
 	unlink(path);
 
 	G_done_msg(_("Raster map <%s> modified."), name);