[Scipy-svn] r4053 - trunk/scipy/ndimage/src/segment

[scipy-svn at scipy.org]

Author: tom.waite
Date: 2008-03-26 18:37:22 -0500 (Wed, 26 Mar 2008)
New Revision: 4053

Modified:
   trunk/scipy/ndimage/src/segment/Segmenter_IMPL.c
Log:
completed texture feature code.

Modified: trunk/scipy/ndimage/src/segment/Segmenter_IMPL.c
===================================================================
--- trunk/scipy/ndimage/src/segment/Segmenter_IMPL.c	2008-03-26 23:36:52 UTC (rev 4052)
+++ trunk/scipy/ndimage/src/segment/Segmenter_IMPL.c	2008-03-26 23:37:22 UTC (rev 4053)
@@ -918,11 +918,10 @@
 			filterResult1 = lawsConvolution(myImage, rowFilter, colFilter, kernelSize);
 			/* lawsLayer 0 is the LP and needs to be used to scale. */
 			if(outerKernelNumber){
-			    // to normalize based on Laws LL kernel. not implemented now.
-			    //lawsImage[lawsLayer*layerStep + i*srcCols + j] = (float)2.0 * filterResult1 / lawsLL;
 			    lawsImage[lawsLayer*layerStep + i*srcCols + j] = (float)2.0 * filterResult1;
 			}
 			else{
+			    lawsLL = filterResult1;
 			    lawsLL = (float)2.0 * filterResult1;
 			    lawsImage[lawsLayer*layerStep + i*srcCols + j] = (float)2.0 * filterResult1;
 			}
@@ -937,8 +936,6 @@
 			    filterResult1 = lawsConvolution(myImage, rowFilter, colFilter, kernelSize);
 			    filterResult2 = lawsConvolution(myImage, colFilter, rowFilter, kernelSize);
 			    lawsImage[lawsLayer*layerStep + i*srcCols + j] = filterResult1 + filterResult2;
-			                      //  (filterResult1 / lawsLL) + (filterResult2 / lawsLL);
-			    // to normalize based on Laws LL kernel. not implemented now.
 			    ++lawsLayer;
 			}
 		    }