[GRASS-SVN] r33090 - grass/branches/develbranch_6/lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 26 09:32:14 EDT 2008
Author: neteler
Date: 2008-08-26 09:32:14 -0400 (Tue, 26 Aug 2008)
New Revision: 33090
Modified:
grass/branches/develbranch_6/lib/gis/interp.c
Log:
Fix formatting (merge r33088)
Modified: grass/branches/develbranch_6/lib/gis/interp.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/interp.c 2008-08-26 13:03:48 UTC (rev 33089)
+++ grass/branches/develbranch_6/lib/gis/interp.c 2008-08-26 13:32:14 UTC (rev 33090)
@@ -6,8 +6,8 @@
return u * (c1 - c0) + c0;
}
-DCELL G_interp_bilinear(double u, double v, DCELL c00, DCELL c01, DCELL c10,
- DCELL c11)
+DCELL G_interp_bilinear(double u, double v,
+ DCELL c00, DCELL c01, DCELL c10, DCELL c11)
{
DCELL c0 = G_interp_linear(u, c00, c01);
DCELL c1 = G_interp_linear(u, c10, c11);
@@ -17,9 +17,7 @@
DCELL G_interp_cubic(double u, DCELL c0, DCELL c1, DCELL c2, DCELL c3)
{
- return (u *
- (u *
- (u * (c3 - 3 * c2 + 3 * c1 - c0) +
+ return (u * (u * (u * (c3 - 3 * c2 + 3 * c1 - c0) +
(-c3 + 4 * c2 - 5 * c1 + 2 * c0)) + (c2 - c0)) + 2 * c1) / 2;
}
More information about the grass-commit
mailing list