Merge pull request #2048 from alexbruy/fix-curvature-filter

mhugent · mhugent · commit b7a4e9856b11 · 2015-05-25T10:48:23.000+02:00
fix total curvature calculation (fix #5967)
diff --git a/src/analysis/raster/qgstotalcurvaturefilter.cpp b/src/analysis/raster/qgstotalcurvaturefilter.cpp
@@ -41,8 +41,8 @@ float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, fl
 
   double cellSizeAvg = ( mCellSizeX + mCellSizeY ) / 2.0;
   double dxx = ( *x32 - 2 * *x22 + *x12 ) / ( mCellSizeX * mCellSizeX );
-  double dyy = ( -*x11 + *x31 + *x13 - *x33 ) / ( 4 * cellSizeAvg * cellSizeAvg );
-  double dxy = ( *x21 - 2 * *x22 + *x23 ) / ( mCellSizeY * mCellSizeY );
+  double dxy = ( -*x11 + *x31 + *x13 - *x33 ) / ( 4 * cellSizeAvg * cellSizeAvg );
+  double dyy = ( *x21 - 2 * *x22 + *x23 ) / ( mCellSizeY * mCellSizeY );
 
   return dxx*dxx + 2*dxy*dxy + dyy*dyy;
 }

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, fl`
`41`	`41`
`42`	`42`	`double cellSizeAvg = ( mCellSizeX + mCellSizeY ) / 2.0;`
`43`	`43`	`double dxx = ( x32 - 2 x22 + x12 ) / ( mCellSizeX * mCellSizeX );`
`44`		`- double dyy = ( -x11 + x31 + x13 - x33 ) / ( 4 * cellSizeAvg * cellSizeAvg );`
`45`		`- double dxy = ( x21 - 2 x22 + x23 ) / ( mCellSizeY * mCellSizeY );`
	`44`	`+ double dxy = ( -x11 + x31 + x13 - x33 ) / ( 4 * cellSizeAvg * cellSizeAvg );`
	`45`	`+ double dyy = ( x21 - 2 x22 + x23 ) / ( mCellSizeY * mCellSizeY );`
`46`	`46`
`47`	`47`	`return dxxdxx + 2dxydxy + dyydyy;`
`48`	`48`	`}`