<div dir="ltr"><div>Hi, Thanks for pointing me to the script. I just manually adjusted several lines to make them 80 columns. Based on the script, it looks like couple options were dropped (-ts8, -ut) and new ones were added (-npro, --no-tabs).<br><div><br></div><div><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 15, 2015 at 1:22 PM, Vaclav Petras <span dir="ltr"><<a href="mailto:wenzeslaus@gmail.com" target="_blank">wenzeslaus@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi, I see that you are making the indent in a file consistent but I just wanted to make sure you know that I recently updated the script ./tools/grass_indent.sh.<br></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 15, 2015 at 11:42 AM, <span dir="ltr"><<a href="mailto:svn_grass@osgeo.org" target="_blank">svn_grass@osgeo.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hcho<br>
Date: 2015-05-15 08:42:52 -0700 (Fri, 15 May 2015)<br>
New Revision: 65249<br>
<br>
Modified:<br>
grass/trunk/raster/r.topidx/main.c<br>
grass/trunk/raster/r.topidx/topidx.c<br>
Log:<br>
r.topidx: indent<br>
<br>
Modified: grass/trunk/raster/r.topidx/main.c<br>
===================================================================<br>
--- grass/trunk/raster/r.topidx/main.c 2015-05-15 14:45:57 UTC (rev 65248)<br>
+++ grass/trunk/raster/r.topidx/main.c 2015-05-15 15:42:52 UTC (rev 65249)<br>
@@ -51,7 +51,7 @@<br>
exit(EXIT_FAILURE);<br>
<br>
/* Make sure that the current projection is not lat/long */<br>
- if ((G_projection() == PROJECTION_LL))<br>
+ if (G_projection() == PROJECTION_LL)<br>
G_fatal_error(_("Lat/Long location is not supported by %s. Please reproject map first."),<br>
G_program_name());<br>
<br>
<br>
Modified: grass/trunk/raster/r.topidx/topidx.c<br>
===================================================================<br>
--- grass/trunk/raster/r.topidx/topidx.c 2015-05-15 14:45:57 UTC (rev 65248)<br>
+++ grass/trunk/raster/r.topidx/topidx.c 2015-05-15 15:42:52 UTC (rev 65249)<br>
@@ -125,7 +125,8 @@<br>
sum += route[0];<br>
nroute++;<br>
}<br>
- if (!is_cv_null(i - 1, j) && cv(i, j) - cv(i - 1, j) > ZERO) {<br>
+ if (!is_cv_null(i - 1, j) &&<br>
+ cv(i, j) - cv(i - 1, j) > ZERO) {<br>
tanB[1] = (cv(i, j) - cv(i - 1, j)) * dx1;<br>
route[1] = 0.5 * dx * tanB[1];<br>
sum += route[1];<br>
@@ -148,7 +149,8 @@<br>
nroute++;<br>
}<br>
if (j + 1 < window.cols) {<br>
- if (!is_cv_null(i, j + 1) && cv(i, j) - cv(i, j + 1) > ZERO) {<br>
+ if (!is_cv_null(i, j + 1) &&<br>
+ cv(i, j) - cv(i, j + 1) > ZERO) {<br>
tanB[5] = (cv(i, j) - cv(i, j + 1)) * dx1;<br>
route[5] = 0.5 * dx * tanB[5];<br>
sum += route[5];<br>
@@ -164,7 +166,8 @@<br>
sum += route[6];<br>
nroute++;<br>
}<br>
- if (!is_cv_null(i + 1, j) && cv(i, j) - cv(i + 1, j) > ZERO) {<br>
+ if (!is_cv_null(i + 1, j) &&<br>
+ cv(i, j) - cv(i + 1, j) > ZERO) {<br>
tanB[7] = (cv(i, j) - cv(i + 1, j)) * dx1;<br>
route[7] = 0.5 * dx * tanB[7];<br>
sum += route[7];<br>
@@ -187,46 +190,38 @@<br>
nslp = 0;<br>
if (i > 0) {<br>
if (j > 0 && !is_cv_null(i - 1, j - 1)) {<br>
- sumtb += (cv(i - 1, j - 1)<br>
- - cv(i, j)) * dx2;<br>
+ sumtb += (cv(i - 1, j - 1) - cv(i, j)) * dx2;<br>
nslp++;<br>
}<br>
if (!is_cv_null(i - 1, j)) {<br>
- sumtb += (cv(i - 1, j)<br>
- - cv(i, j)) * dx1;<br>
+ sumtb += (cv(i - 1, j) - cv(i, j)) * dx1;<br>
nslp++;<br>
}<br>
if (j + 1 < window.cols && !is_cv_null(i - 1, j + 1)) {<br>
- sumtb += (cv(i - 1, j + 1)<br>
- - cv(i, j)) * dx2;<br>
+ sumtb += (cv(i - 1, j + 1) - cv(i, j)) * dx2;<br>
nslp++;<br>
}<br>
}<br>
<br>
if (j > 0 && !is_cv_null(i, j - 1)) {<br>
- sumtb += (cv(i, j - 1)<br>
- - cv(i, j)) * dx1;<br>
+ sumtb += (cv(i, j - 1) - cv(i, j)) * dx1;<br>
nslp++;<br>
}<br>
if (j + 1 < window.cols && !is_cv_null(i, j + 1)) {<br>
- sumtb += (cv(i, j + 1)<br>
- - cv(i, j)) * dx1;<br>
+ sumtb += (cv(i, j + 1) - cv(i, j)) * dx1;<br>
nslp++;<br>
}<br>
if (i + 1 < window.rows) {<br>
if (j > 0 && !is_cv_null(i + 1, j - 1)) {<br>
- sumtb += (cv(i + 1, j - 1)<br>
- - cv(i, j)) * dx2;<br>
+ sumtb += (cv(i + 1, j - 1) - cv(i, j)) * dx2;<br>
nslp++;<br>
}<br>
if (!is_cv_null(i + 1, j)) {<br>
- sumtb += (cv(i + 1, j)<br>
- - cv(i, j)) * dx1;<br>
+ sumtb += (cv(i + 1, j) - cv(i, j)) * dx1;<br>
nslp++;<br>
}<br>
if (j + 1 < window.cols && !is_cv_null(i + 1, j + 1)) {<br>
- sumtb += (cv(i + 1, j + 1)<br>
- - cv(i, j)) * dx2;<br>
+ sumtb += (cv(i + 1, j + 1) - cv(i, j)) * dx2;<br>
nslp++;<br>
}<br>
}<br>
<br>
_______________________________________________<br>
grass-commit mailing list<br>
<a href="mailto:grass-commit@lists.osgeo.org" target="_blank">grass-commit@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/grass-commit" target="_blank">http://lists.osgeo.org/mailman/listinfo/grass-commit</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>