[GRASS-SVN] r63555 - in grass/branches/releasebranch_7_0: . lib/display lib/pngdriver temporal
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 15 04:42:10 PST 2014
Author: martinl
Date: 2014-12-15 04:42:10 -0800 (Mon, 15 Dec 2014)
New Revision: 63555
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/display/raster.c
grass/branches/releasebranch_7_0/lib/pngdriver/raster.c
grass/branches/releasebranch_7_0/temporal/
Log:
displaylib: doxygen cosmetics
(merge r63554 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,63524,63526,63536-63537,63551-63552
+ /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,63524,63526,63536-63537,63551-63552,63554
Modified: grass/branches/releasebranch_7_0/lib/display/raster.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/display/raster.c 2014-12-15 12:40:52 UTC (rev 63554)
+++ grass/branches/releasebranch_7_0/lib/display/raster.c 2014-12-15 12:42:10 UTC (rev 63555)
@@ -27,40 +27,26 @@
static int draw_cell(int, const void *, struct Colors *, RASTER_MAP_TYPE);
-/* routines used by programs such as Dcell, display, combine, and weight
- * for generating raster images (for 1-byte, i.e. not super-cell, data)
- *
- * D_cell_draw_setup(t, b, l, r)
- * int t, b, l, r (pixle extents of display window)
- * (obtainable via D_get_dst(&t, &b, &l, &r)
- * Sets up the environment for D_draw_cell
- *
- * D_draw_cell(A_row, xarray, colors)
- * int A_row ;
- * CELL *xarray ;
- * - determinew which pixle row gets the data
- * - resamples the data to create a pixle array
- * - determines best way to draw the array
- * a - for single cat array, a move and a draw
- * b - otherwise, a call to D_raster()
- * - returns -1 on error or end of picture
- * or array row number needed for next pixle row.
- *
- * presumes the map is drawn from north to south
- *
- * ALSO: if overlay mode is desired, then call D_set_overlay_mode(1)
- * first.
- */
-
/*!
\brief Draw raster row
- \param A_row row number
- \param array
+ - determine which pixel row gets the data
+ - resamples the data to create a pixel array
+ - determines best way to draw the array
+ a - for single cat array, a move and a draw
+ b - otherwise, a call to D_raster()
+
+ Presumes the map is drawn from north to south.
+
+ If overlay mode is desired, then call D_set_overlay_mode() first.
+
+ \param A_row row number (starts at 0)
+ \param array data buffer
\param colors pointer to Colors structure
\param data_type raster type (CELL, FCELL, DCELL)
- \return
+ \return next row number needed for next pixel row
+ \return -1 nothing to draw (on error or end of raster)
*/
int D_draw_raster(int A_row,
const void *array,
@@ -72,8 +58,8 @@
/*!
\brief Draw raster row (DCELL)
- \param A_row row number
- \param darray
+ \param A_row row number (starts at 0)
+ \param darray data buffer
\param colors pointer to Colors structure
\return
@@ -129,7 +115,8 @@
\param carray
\param colors pointer to Colors structure
- \return
+ \return next row to draw
+ \return -1 nothing to draw
*/
int D_draw_cell(int A_row, const CELL * carray, struct Colors *colors)
{
Modified: grass/branches/releasebranch_7_0/lib/pngdriver/raster.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/pngdriver/raster.c 2014-12-15 12:40:52 UTC (rev 63554)
+++ grass/branches/releasebranch_7_0/lib/pngdriver/raster.c 2014-12-15 12:42:10 UTC (rev 63555)
@@ -102,8 +102,8 @@
/*!
\brief Draw raster row
- \param n number of cell
- \param row raster row
+ \param n number of cells
+ \param row raster row (starts at 0)
\param red,grn,blu,nul red,green,blue and null value
\return next row
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63345,63391,63393
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
089,63091,63093,63170,63345,63391,63393,63554
More information about the grass-commit
mailing list