[GRASS-SVN] r40159 - in grass-addons/raster: r.out.gmt r.out.gmt2

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-12-28 12:04:36 -0500 (Mon, 28 Dec 2009)
New Revision: 40159

Modified:
   grass-addons/raster/r.out.gmt/r.out.gmt
   grass-addons/raster/r.out.gmt2/r.out.gmt2
Log:
bugfix: DCELL maps would use empty tmp_FCELL's empty color map instead of original DCELL's colr map

Modified: grass-addons/raster/r.out.gmt/r.out.gmt
===================================================================
--- grass-addons/raster/r.out.gmt/r.out.gmt	2009-12-28 16:53:20 UTC (rev 40158)
+++ grass-addons/raster/r.out.gmt/r.out.gmt	2009-12-28 17:04:36 UTC (rev 40159)
@@ -184,12 +184,12 @@
 
 
 # create cpt color table from raster's colr file
-eval `g.findfile elem=colr file="$MAP_NAME" | grep "^file="`
+eval `g.findfile elem=colr file="$GIS_OPT_INPUT" | grep "^file="`
 COLR_FILE="$file"
 
 echo "#" > "$OUTPUT_CPT"
 echo "# GMT colormap created by the `g.version` r.out.gmt script" >> "$OUTPUT_CPT"
-echo "# from base map [$MAP_NAME]" >> "$OUTPUT_CPT"
+echo "# from base map [$GIS_OPT_INPUT]" >> "$OUTPUT_CPT"
 echo "# created by ${USER}@${HOSTNAME} at `date`" >> "$OUTPUT_CPT"
 echo "#" >> "$OUTPUT_CPT"
 echo "# COLOR_MODEL = RGB" >> "$OUTPUT_CPT"

Modified: grass-addons/raster/r.out.gmt2/r.out.gmt2
===================================================================
--- grass-addons/raster/r.out.gmt2/r.out.gmt2	2009-12-28 16:53:20 UTC (rev 40158)
+++ grass-addons/raster/r.out.gmt2/r.out.gmt2	2009-12-28 17:04:36 UTC (rev 40159)
@@ -219,7 +219,7 @@
 eval "comment=\"$comment\""
 
 # create cpt color table from raster's colr file
-eval `g.findfile elem=colr file="$map_name" | grep "^file="`
+eval `g.findfile elem=colr file="$input_map" | grep "^file="`
 colr_file="$file"
 
 cat<<EOT > "$output_cpt"