[GRASS-SVN] r63583 - in grass/branches/releasebranch_7_0: . display/d.his display/d.rast display/d.rgb include/defs lib/display

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Dec 18 05:33:23 PST 2014


Author: martinl
Date: 2014-12-18 05:33:23 -0800 (Thu, 18 Dec 2014)
New Revision: 63583

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.his/main.c
   grass/branches/releasebranch_7_0/display/d.rast/display.c
   grass/branches/releasebranch_7_0/display/d.rgb/main.c
   grass/branches/releasebranch_7_0/include/defs/display.h
   grass/branches/releasebranch_7_0/lib/display/raster.c
   grass/branches/releasebranch_7_0/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()
    update modules
    (merge r63558-9 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
 63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63307,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63562,63570,63576
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
 63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63307,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576

Modified: grass/branches/releasebranch_7_0/display/d.his/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.his/main.c	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/display/d.his/main.c	2014-12-18 13:33:23 UTC (rev 63583)
@@ -187,7 +187,7 @@
     intensity = 255;		/* default is to not change intensity */
     saturation = 255;		/* default is to not change saturation */
 
-    D_cell_draw_begin();
+    D_raster_draw_begin();
 
     next_row = 0;
     for (atrow = 0; atrow < window.rows;) {
@@ -238,7 +238,7 @@
 	    break;
     }
     G_percent(window.rows, window.rows, 5);
-    D_cell_draw_end();
+    D_raster_draw_end();
 
     D_save_command(G_recreate_command());
     

Modified: grass/branches/releasebranch_7_0/display/d.rast/display.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rast/display.c	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/display/d.rast/display.c	2014-12-18 13:33:23 UTC (rev 63583)
@@ -63,7 +63,7 @@
     /* Allocate space for cell buffer */
     xarray = Rast_allocate_buf(data_type);
 
-    D_cell_draw_begin();
+    D_raster_draw_begin();
 
     /* loop for array rows */
     for (cur_A_row = 0; cur_A_row != -1;) {
@@ -76,7 +76,7 @@
 	cur_A_row = D_draw_raster(cur_A_row, xarray, colors, data_type);
 
     }
-    D_cell_draw_end();
+    D_raster_draw_end();
 
     G_percent(nrows, nrows, 2);
 

Modified: grass/branches/releasebranch_7_0/display/d.rgb/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rgb/main.c	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/display/d.rgb/main.c	2014-12-18 13:33:23 UTC (rev 63583)
@@ -106,7 +106,7 @@
     /* read in current window */
     G_get_window(&window);
 
-    D_cell_draw_begin();
+    D_raster_draw_begin();
 
     next_row = 0;
     for (row = 0; row < window.rows;) {
@@ -127,7 +127,7 @@
 	    break;
     }
     G_percent(window.rows, window.rows, 5);
-    D_cell_draw_end();
+    D_raster_draw_end();
     
     D_save_command(G_recreate_command());
     D_close_driver();

Modified: grass/branches/releasebranch_7_0/include/defs/display.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/display.h	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/include/defs/display.h	2014-12-18 13:33:23 UTC (rev 63583)
@@ -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/branches/releasebranch_7_0/lib/display/raster.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/display/raster.c	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/lib/display/raster.c	2014-12-18 13:33:23 UTC (rev 63583)
@@ -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/branches/releasebranch_7_0/lib/display/raster2.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/display/raster2.c	2014-12-18 12:27:09 UTC (rev 63582)
+++ grass/branches/releasebranch_7_0/lib/display/raster2.c	2014-12-18 13:33:23 UTC (rev 63583)
@@ -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);



More information about the grass-commit mailing list