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

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

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

Modified Files:
	entropy.cpp 
Log Message:
- Changed from cmSize[3] to cmSizeV, cmSizeH and cmSizeS (readability)


Index: entropy.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/entropy.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entropy.cpp	31 May 2005 03:20:02 -0000	1.4
+++ entropy.cpp	2 Jun 2005 02:11:39 -0000	1.5
@@ -51,18 +51,18 @@
 
 float KTHSVCMEntropy::_calculate(KTImage *img, int direction)
 {
-    int cmSize[3];
+    int cmSizeH, cmSizeS, cmSizeV;
     float ***cm = (float***) method()->data(direction);
     KTMethod *m = method();
 
-    cmSize[0] = m->dataSize(0);
-    cmSize[1] = m->dataSize(1);
-    cmSize[2] = m->dataSize(2);
+    cmSizeV = m->dataSize(0);
+    cmSizeH = m->dataSize(1);
+    cmSizeS = m->dataSize(2);
 
     float sum = 0.;
-    for (int i=0; i < cmSize[0]; i++)
-        for (int j=0; j< cmSize[1]; j++)
-            for (int k=0; k < cmSize[2]; k++)
+    for (int i=0; i < cmSizeV; ++i)
+        for (int j=0; j< cmSizeH; ++j)
+            for (int k=0; k < cmSizeS; ++k)
                 sum += cm[i][j][k] * log10(cm[i][j][k] + EPSILON);
     return sum;
 }