[GRASS-SVN] r39402 - grass/trunk/imagery/i.his.rgb

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-10-05 03:34:54 -0400 (Mon, 05 Oct 2009)
New Revision: 39402

Modified:
   grass/trunk/imagery/i.his.rgb/closefiles.c
   grass/trunk/imagery/i.his.rgb/his2rgb.c
Log:
metadata and cleanup (merge from devbr6)

Modified: grass/trunk/imagery/i.his.rgb/closefiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/closefiles.c	2009-10-05 07:17:22 UTC (rev 39401)
+++ grass/trunk/imagery/i.his.rgb/closefiles.c	2009-10-05 07:34:54 UTC (rev 39402)
@@ -13,6 +13,7 @@
     int i;
     struct Colors colors;
     struct Range range;
+    struct History history;
     CELL min, max;
     const char *mapset;
 
@@ -23,6 +24,8 @@
 
     mapset = G_mapset();
 
+    /* write colors */
+    /*   set to 0,max_level instead of min,max ?? */
     Rast_read_range(r_name, mapset, &range);
     Rast_get_range_min_max(&range, &min, &max);
     Rast_make_grey_scale_colors(&colors, min, max);
@@ -38,5 +41,21 @@
     Rast_make_grey_scale_colors(&colors, min, max);
     Rast_write_colors(b_name, mapset, &colors);
 
+    /* write metadata */
+    Rast_short_history(r_name, "raster", &history);
+    Rast_command_history(&history);
+    Rast_write_history(r_name, &history);
+    Rast_put_cell_title(r_name, "Image red");
+
+    Rast_short_history(g_name, "raster", &history);
+    Rast_command_history(&history);
+    Rast_write_history(g_name, &history);
+    Rast_put_cell_title(g_name, "Image green");
+
+    Rast_short_history(b_name, "raster", &history);
+    Rast_command_history(&history);
+    Rast_write_history(b_name, &history);
+    Rast_put_cell_title(b_name, "Image blue");
+
     return 0;
 }

Modified: grass/trunk/imagery/i.his.rgb/his2rgb.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/his2rgb.c	2009-10-05 07:17:22 UTC (rev 39401)
+++ grass/trunk/imagery/i.his.rgb/his2rgb.c	2009-10-05 07:34:54 UTC (rev 39402)
@@ -19,7 +19,7 @@
 #include <grass/gis.h>
 #include "globals.h"
 
-void his2rgb(CELL * rowbuffer[3], int columns)
+void his2rgb(CELL *rowbuffer[3], int columns)
 {
     long sample;		/* sample indicator                          */
     double red;			/* the red band output                       */
@@ -121,16 +121,16 @@
 	else
 	    blue = blue255;
 
-	if (red > 254.5)
-	    red = 254.5;
+	if (red > 255. - 0.5)
+	    red = 255. - 0.5;
 	if (red < 0.0)
 	    red = 0.0;
-	if (green > 254.5)
-	    green = 254.5;
+	if (green > 255. - 0.5)
+	    green = 255. - 0.5;
 	if (green < 0.0)
 	    green = 0.0;
-	if (blue > 254.5)
-	    blue = 254.5;
+	if (blue > 255. - 0.5)
+	    blue = 255. - 0.5;
 	if (blue < 0.0)
 	    blue = 0.0;