[GRASS-SVN] r63558 - in grass/trunk: include/defs lib/display

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-15 05:13:19 -0800 (Mon, 15 Dec 2014)
New Revision: 63558

Modified:
   grass/trunk/include/defs/display.h
   grass/trunk/lib/display/raster.c
   grass/trunk/lib/display/raster2.c
Log:
displaylib: D_draw_cell() removed/replaced by D_draw_c_raster()
            D_cell_draw_begin() renamed to D_raster_draw_begin()
            D_cell_draw_end() rename do D_raster_draw_end()


Modified: grass/trunk/include/defs/display.h
===================================================================
--- grass/trunk/include/defs/display.h	2014-12-15 13:03:18 UTC (rev 63557)
+++ grass/trunk/include/defs/display.h	2014-12-15 13:13:19 UTC (rev 63558)
@@ -107,12 +107,11 @@
 int D_draw_d_raster(int, const DCELL *, struct Colors *);
 int D_draw_f_raster(int, const FCELL *, struct Colors *);
 int D_draw_c_raster(int, const CELL *, struct Colors *);
-int D_draw_cell(int, const CELL *, struct Colors *);
-void D_cell_draw_begin(void);
+void D_raster_draw_begin(void);
 int D_draw_raster_RGB(int, const void *, const void *, const void *,
 		      struct Colors *, struct Colors *, struct Colors *,
 		      RASTER_MAP_TYPE, RASTER_MAP_TYPE, RASTER_MAP_TYPE);
-void D_cell_draw_end(void);
+void D_raster_draw_end(void);
 
 /* raster2.c */
 int D_set_overlay_mode(int);

Modified: grass/trunk/lib/display/raster.c
===================================================================
--- grass/trunk/lib/display/raster.c	2014-12-15 13:03:18 UTC (rev 63557)
+++ grass/trunk/lib/display/raster.c	2014-12-15 13:13:19 UTC (rev 63558)
@@ -86,6 +86,14 @@
 
 /*!
   \brief Draw raster row (CELL)
+
+  The <b>row</b> gives the map array row. The <b>carray</b> array
+  provides the categories for each raster value in that row.  This
+  routine is called consecutively with the information necessary to
+  draw a raster image from north to south. No rows can be skipped. All
+  screen pixel rows which represent the current map array row are
+  rendered. The routine returns the map array row which is needed to
+  draw the next screen pixel row.
   
   \param A_row row number (starts at 0)
   \param carray data buffer
@@ -99,32 +107,6 @@
     return draw_cell(A_row, carray, colors, CELL_TYPE);
 }
 
-
-/*!
-  \brief Render a raster row
-
-  \todo Replace by D_draw_c_raster()
-  
-  The <b>row</b> gives the map array row. The <b>raster</b> array
-  provides the categories for each raster value in that row.  This
-  routine is called consecutively with the information necessary to
-  draw a raster image from north to south. No rows can be skipped. All
-  screen pixel rows which represent the current map array row are
-  rendered. The routine returns the map array row which is needed to
-  draw the next screen pixel row.
- 
-  \param A_row row number
-  \param carray
-  \param colors pointer to Colors structure
-  
-  \return next row to draw
-  \return -1 nothing to draw
-*/
-int D_draw_cell(int A_row, const CELL * carray, struct Colors *colors)
-{
-    return draw_cell(A_row, carray, colors, CELL_TYPE);
-}
-
 static int draw_cell(int A_row,
 		     const void *array,
 		     struct Colors *colors, RASTER_MAP_TYPE data_type)
@@ -167,7 +149,7 @@
   <b>right</b>, all of which are obtainable from D_get_dst() for the
   current frame.
 */
-void D_cell_draw_begin(void)
+void D_raster_draw_begin(void)
 {
     /* Set up the screen for drawing map */
     D_get_a(src);
@@ -244,9 +226,9 @@
 }
 
 /*!
-  \brief Finish rendering
+  \brief Finish raster rendering
 */
-void D_cell_draw_end(void)
+void D_raster_draw_end(void)
 {
     COM_end_raster();
 }

Modified: grass/trunk/lib/display/raster2.c
===================================================================
--- grass/trunk/lib/display/raster2.c	2014-12-15 13:03:18 UTC (rev 63557)
+++ grass/trunk/lib/display/raster2.c	2014-12-15 13:13:19 UTC (rev 63558)
@@ -37,17 +37,16 @@
 
 
 /*!
- * \brief configure raster overlay mode
+ * \brief Configure raster overlay mode
  *
- * This routine determines if <i>D_draw_cell</i> draws in overlay mode
- * (locations with category 0 are left untouched) or not (colored with the color
- * for category 0). Set <b>flag</b> to 1 (TRUE) for overlay mode; 0 (FALSE)
- * otherwise.
+ * This routine determines if D_draw_raster() draws in overlay mode
+ * (locations with category 0 are left untouched) or not (colored with
+ * the color for category 0).
  *
- *  \param flag
- *  \return int
+ * \param n 1 (TRUE) for overlay mode; 0 (FALSE) otherwise
+ *
+ * \return 0
  */
-
 int D_set_overlay_mode(int n)
 {
     D__overlay_mode = (n != 0);