[kimageprocess-devel] kimageprocess/src/methods/hsvcm/features/contrast contrast.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/contrast
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16695/src/methods/hsvcm/features/contrast

Modified Files:
	contrast.cpp 
Log Message:

- Fixed contrast calculation
- Changed correlation calculation (but now it is getting a `nan'  result :-S



Index: contrast.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/contrast/contrast.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- contrast.cpp	8 Apr 2005 20:02:13 -0000	1.4
+++ contrast.cpp	28 May 2005 21:29:27 -0000	1.5
@@ -66,7 +66,7 @@
     {
         float sum[max];
         for (int a=0; a < max; a++)
-            sum[max] = 0;
+            sum[a] = 0;
         for (int i=0; i < cmSize[0]; i++)
             for (int j=0; j < cmSize[1]; j++)
                sum[abs(i-j)] += cm[i][j][k];
@@ -82,7 +82,7 @@
     {
         float sum[max];
         for (int a=0; a < max; a++)
-            sum[max] = 0;
+            sum[a] = 0;
         for (int i=0; i < cmSize[0]; i++)
             for (int k=0; k < cmSize[2]; k++)
                sum[abs(i-k)] += cm[i][j][k];
@@ -92,13 +92,13 @@
             bigsum[1] += sum[n] * n * n;
     }   
 
-    // calculating the S component
+    // calculating the V component
     max = MAX(cmSize[1], cmSize[2]);
-    for (int i=0; i < cmSize[2]; i++)
+    for (int i=0; i < cmSize[0]; i++)
     {
         float sum[max];
         for (int a=0; a < max; a++)
-            sum[max] = 0;
+            sum[a] = 0;
         for (int k=0; k < cmSize[2]; k++)
             for (int j=0; j < cmSize[1]; j++)
                sum[abs(k-j)] += cm[i][j][k];
@@ -108,7 +108,7 @@
             bigsum[2] += sum[n] * n * n;
     }
     float result = bigsum[0] / cmSize[2] + bigsum[1] / cmSize[1] + bigsum[2] / cmSize[0];
-    kdDebug() << "Result: " << result << endl;
+    //kdDebug() << "Result: " << result << endl;
     return result;
 }