[GRASS-SVN] r42401 - grass/trunk/raster/r.out.tiff

svn_grass at osgeo.org svn_grass at osgeo.org
Sun May 30 20:35:47 EDT 2010


Author: hamish
Date: 2010-05-30 20:35:46 -0400 (Sun, 30 May 2010)
New Revision: 42401

Modified:
   grass/trunk/raster/r.out.tiff/main.c
Log:
rename world file flag for compatibility with, & in prep for, merging transparent NULL cells flag from r.out.png

Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c	2010-05-30 23:23:01 UTC (rev 42400)
+++ grass/trunk/raster/r.out.tiff/main.c	2010-05-31 00:35:46 UTC (rev 42401)
@@ -76,7 +76,7 @@
     int in;
     struct rasterfile h;
     struct Option *inopt, *outopt, *compopt;
-    struct Flag *pflag, *lflag, *tflag;
+    struct Flag *pflag, *lflag, *tflag, *wflag;
     CELL *cell, *cellptr, *cells[MAX_TILE_LENGTH];
     struct Cell_head cellhd;
     struct GModule *module;
@@ -115,9 +115,14 @@
     pflag->key = 'p';
     pflag->description = _("TIFF Palette output (8bit instead of 24bit).");
 
+/* TODO (copy method from r.out.png)
     tflag = G_define_flag();
     tflag->key = 't';
-    tflag->description = _("Output TIFF world file");
+    tflag->description = _("Make NULL cells transparent");
+*/
+    wflag = G_define_flag();
+    wflag->key = 'w';
+    wflag->description = _("Output TIFF world file");
 
     lflag = G_define_flag();
     lflag->key = 'l';
@@ -137,7 +142,7 @@
 
     tiled = lflag->answer;
     palette = pflag->answer;
-    tfw = tflag->answer;
+    tfw = wflag->answer;
 
     Rast_get_cellhd(inopt->answer, "", &cellhd);
 



More information about the grass-commit mailing list