[GRASS-SVN] r55501 - in grass/branches/releasebranch_6_4: db/drivers/mysql lib/arraystats lib/nviz lib/vector/neta lib/vector/vedit vector/v.net.visibility
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Mar 22 12:28:16 PDT 2013
Author: neteler
Date: 2013-03-22 12:28:16 -0700 (Fri, 22 Mar 2013)
New Revision: 55501
Modified:
grass/branches/releasebranch_6_4/db/drivers/mysql/describe.c
grass/branches/releasebranch_6_4/lib/arraystats/class.c
grass/branches/releasebranch_6_4/lib/nviz/draw.c
grass/branches/releasebranch_6_4/lib/nviz/position.c
grass/branches/releasebranch_6_4/lib/vector/neta/articulation_point.c
grass/branches/releasebranch_6_4/lib/vector/neta/bridge.c
grass/branches/releasebranch_6_4/lib/vector/vedit/render.c
grass/branches/releasebranch_6_4/lib/vector/vedit/zbulk.c
grass/branches/releasebranch_6_4/vector/v.net.visibility/data_structures.c
Log:
Don't use // comments (C89 compatibility) (partial backport of r55499)
Modified: grass/branches/releasebranch_6_4/db/drivers/mysql/describe.c
===================================================================
--- grass/branches/releasebranch_6_4/db/drivers/mysql/describe.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/db/drivers/mysql/describe.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -204,8 +204,8 @@
break;
case MYSQL_TYPE_DATETIME:
- //*sqltype = DB_SQL_TYPE_DATETIME;
- //*sqltype |= DB_DATETIME_MASK;
+ /* *sqltype = DB_SQL_TYPE_DATETIME; */
+ /* *sqltype |= DB_DATETIME_MASK; */
*sqltype = DB_SQL_TYPE_TIMESTAMP;
break;
Modified: grass/branches/releasebranch_6_4/lib/arraystats/class.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/arraystats/class.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/arraystats/class.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -337,12 +337,12 @@
dmax = d;
nmax = k;
}
- nd--; //A VERIFIER!
+ nd--; /* A VERIFIER! */
if (x[nf] != x[nd]) {
if (nd != 0)
co[j] = (xn[nf] - xn[nd]) / (x[nf] - x[nd]);
else
- co[j] = (xn[nf]) / (x[nf]); //A VERIFIER!
+ co[j] = (xn[nf]) / (x[nf]); /* A VERIFIER! */
}
}
if (i == 1)
Modified: grass/branches/releasebranch_6_4/lib/nviz/draw.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/nviz/draw.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/nviz/draw.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -120,7 +120,7 @@
*/
int Nviz_draw_all_vect()
{
- // GS_set_cancel(0);
+ /* GS_set_cancel(0); */
/* in case transparency is set */
GS_set_draw(GSD_BOTH);
@@ -133,7 +133,7 @@
GS_set_draw(GSD_BACK);
- // GS_set_cancel(0);
+ /* GS_set_cancel(0); */
return 1;
}
@@ -353,14 +353,14 @@
*/
void Nviz_set_2D(int width, int height)
{
- glEnable(GL_BLEND); // images are transparent
+ glEnable(GL_BLEND); /* images are transparent */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0, width, 0, height, -1, 1);
- // set coordinate system from upper left corner
+ /* set coordinate system from upper left corner */
glScalef(1, -1, 1);
glTranslatef(0, -height, 0);
Modified: grass/branches/releasebranch_6_4/lib/nviz/position.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/nviz/position.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/nviz/position.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -125,8 +125,8 @@
*x = realto[0];
*y = realto[1];
*z = realto[2];
- // old nviz code is more complicated and it doesn't work properly,
- // no idea why
+ /* old nviz code is more complicated and it doesn't work properly, */
+ /* no idea why */
return 1;
@@ -146,8 +146,8 @@
realto[1] = y;
realto[2] = z;
GS_set_focus(realto);
- // old nviz code is more complicated and it doesn't work properly,
- // no idea why
+ /* old nviz code is more complicated and it doesn't work properly, */
+ /* no idea why */
return 1;
Modified: grass/branches/releasebranch_6_4/lib/vector/neta/articulation_point.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/neta/articulation_point.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/vector/neta/articulation_point.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -100,7 +100,7 @@
min_tin[node_id] = min_tin[to];
current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id]); /*proceed to the next edge */
}
- for (; current_edge[node_id]; current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id])) { //try next edges
+ for (; current_edge[node_id]; current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id])) { /* try next edges */
dglInt32_t *to =
dglEdgeGet_Tail(graph, current_edge[node_id]);
if (to == parent[node_id])
Modified: grass/branches/releasebranch_6_4/lib/vector/neta/bridge.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/neta/bridge.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/vector/neta/bridge.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -98,7 +98,7 @@
min_tin[node_id] = min_tin[to];
current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id]); /*proceed to the next edge */
}
- for (; current_edge[node_id]; current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id])) { //try next edges
+ for (; current_edge[node_id]; current_edge[node_id] = dglEdgeset_T_Next(¤t[node_id])) { /*try next edges */
dglInt32_t *to =
dglEdgeGet_Tail(graph, current_edge[node_id]);
dglInt32_t edge_id =
Modified: grass/branches/releasebranch_6_4/lib/vector/vedit/render.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/vedit/render.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/vector/vedit/render.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -98,7 +98,7 @@
}
/* draw lines inside of current display region */
- nfeat = Vect_select_lines_by_box(Map, box, GV_POINTS | GV_LINES, // fixme
+ nfeat = Vect_select_lines_by_box(Map, box, GV_POINTS | GV_LINES, /* fixme */
list);
G_debug(1, "Vedit_render_map(): region: w=%f, e=%f, s=%f, n=%f nlines=%d",
box->W, box->E, box->S, box->N, nfeat);
@@ -190,7 +190,7 @@
else if (state.type == GV_CENTROID) {
int cret = Vect_get_centroid_area(Map, line);
- if (cret > 0) { // -> area
+ if (cret > 0) { /* -> area */
obj->type = TYPE_CENTROIDIN;
draw = draw_flag & DRAW_CENTROIDIN;
}
@@ -342,7 +342,7 @@
narrows = 0;
size = 5;
- limit = 5; // 5px for line segment
+ limit = 5; /* 5px for line segment */
dist = Vect_line_length(state.Points);
G_debug(5, " draw_line_dir() line=%d", line);
@@ -368,13 +368,13 @@
draw_arrow(x0, y0, x1, y1, angle, size, line, list);
- if (narrows > 1e2) // low resolution, break
+ if (narrows > 1e2) /* low resolution, break */
break;
narrows++;
}
- // draw at least one arrow in the middle of line
+ /* draw at least one arrow in the middle of line */
if (narrows < 1) {
dist /= 2.;
if (Vect_point_on_line(state.Points, dist,
Modified: grass/branches/releasebranch_6_4/lib/vector/vedit/zbulk.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/vedit/zbulk.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/lib/vector/vedit/zbulk.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -55,7 +55,6 @@
Points_se = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
- //cv = (dbCatValArray *) G_malloc (sizeof (dbCatValArray));
db_CatValArray_alloc(&cv, List->n_values);
cv.ctype = DB_C_TYPE_DOUBLE;
cv.n_values = 0;
Modified: grass/branches/releasebranch_6_4/vector/v.net.visibility/data_structures.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.net.visibility/data_structures.c 2013-03-22 18:54:56 UTC (rev 55500)
+++ grass/branches/releasebranch_6_4/vector/v.net.visibility/data_structures.c 2013-03-22 19:28:16 UTC (rev 55501)
@@ -76,7 +76,7 @@
int j;
if (l < r) {
- // divide and conquer
+ /* divide and conquer */
j = partition(a, l, r);
quickSort(a, l, j - 1);
quickSort(a, j + 1, r);
More information about the grass-commit
mailing list