[GRASS-SVN] r38115 - in grass/trunk: include lib/raster raster/r.colors.out raster/r.out.gdal

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-06-29 14:43:11 -0400 (Mon, 29 Jun 2009)
New Revision: 38115

Modified:
   grass/trunk/include/raster.h
   grass/trunk/lib/raster/color_rule_get.c
   grass/trunk/raster/r.colors.out/main.c
   grass/trunk/raster/r.out.gdal/export_band.c
Log:
rasterlib: fns from color_rule_get.c renamed, see
http://trac.osgeo.org/grass/wiki/Grass7/RasterLib


Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h	2009-06-29 13:57:40 UTC (rev 38114)
+++ grass/trunk/include/raster.h	2009-06-29 18:43:11 UTC (rev 38115)
@@ -201,7 +201,7 @@
 
 /* color_rule_get.c */
 int Rast_colors_count(const struct Colors *);
-int Rast_get_f_color_rule(DCELL *, unsigned char *, unsigned char *,
+int Rast_get_fp_color_rule(DCELL *, unsigned char *, unsigned char *,
 		       unsigned char *, DCELL *, unsigned char *,
 		       unsigned char *, unsigned char *,
 		       const struct Colors *, int);

Modified: grass/trunk/lib/raster/color_rule_get.c
===================================================================
--- grass/trunk/lib/raster/color_rule_get.c	2009-06-29 13:57:40 UTC (rev 38114)
+++ grass/trunk/lib/raster/color_rule_get.c	2009-06-29 18:43:11 UTC (rev 38115)
@@ -1,17 +1,14 @@
-
-/**
- * \file color_rule_get.c
+/*!
+ * \file raster/color_rule_get.c
  *
  * \brief Raster Library - Get color rules.
  *
- * (C) 2001-2008 by the GRASS Development Team
+ * (C) 2001-2009 by the GRASS Development Team
  *
- * This program is free software under the GNU General Public License 
+ * This program is free software under the GNU General Public License
  * (>=v2). Read the file COPYING that comes with GRASS for details.
  *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2008
+ * \author Original author CERL
  */
 
 #include <grass/gis.h>
@@ -52,7 +49,8 @@
 /*! 
    \brief Get color rule from both modular and fixed rules
 
-   Rules are returned in the order as stored in the table (i.e. unexpected, high values first)
+   Rules are returned in the order as stored in the table
+   (i.e. unexpected, high values first)
 
    \param val1 color value
    \param[out] r1,g1,b1 color value
@@ -64,10 +62,10 @@
    \return 0 success 
    \return 1 index out of range  
  */
-int Rast_get_f_color_rule(DCELL * val1, unsigned char *r1, unsigned char *g1,
-		       unsigned char *b1, DCELL * val2, unsigned char *r2,
-		       unsigned char *g2, unsigned char *b2,
-		       const struct Colors *colors, int rule)
+int Rast_get_fp_color_rule(DCELL * val1, unsigned char *r1, unsigned char *g1,
+			   unsigned char *b1, DCELL * val2, unsigned char *r2,
+			   unsigned char *g2, unsigned char *b2,
+			   const struct Colors *colors, int rule)
 {
     int index = -1;
     int found = 0;

Modified: grass/trunk/raster/r.colors.out/main.c
===================================================================
--- grass/trunk/raster/r.colors.out/main.c	2009-06-29 13:57:40 UTC (rev 38114)
+++ grass/trunk/raster/r.colors.out/main.c	2009-06-29 18:43:11 UTC (rev 38115)
@@ -119,7 +119,7 @@
 	    DCELL val1, val2;
 	    unsigned char r1, g1, b1, r2, g2, b2;
 
-	    Rast_get_f_color_rule(
+	    Rast_get_fp_color_rule(
 		&val1, &r1, &g1, &b1,
 		&val2, &r2, &g2, &b2,
 		&colors, count - 1 - i);

Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c	2009-06-29 13:57:40 UTC (rev 38114)
+++ grass/trunk/raster/r.out.gdal/export_band.c	2009-06-29 18:43:11 UTC (rev 38115)
@@ -164,7 +164,7 @@
 	    DCELL val1, val2;
 	    unsigned char r1, g1, b1, r2, g2, b2;
 
-	    Rast_get_f_color_rule(&val1, &r1, &g1, &b1, &val2, &r2, &g2, &b2,
+	    Rast_get_fp_color_rule(&val1, &r1, &g1, &b1, &val2, &r2, &g2, &b2,
 			       &sGrassColors, i);