Changeset 1719 for trunk/psLib/src/imageops/psImageStats.c

Timestamp:

Sep 7, 2004, 8:03:26 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/imageops/psImageStats.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-10 01:55:34 $
+*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-08 06:02:47 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -185 +185 @@
 psPolynomial1D* *p_psCreateChebyshevPolys(int maxChebyPoly)
 {
-    psPolynomial1D* *chebPolys = NULL;
+    psPolynomial1D **chebPolys = NULL;
     int i = 0;
     int j = 0;
 
-    chebPolys = (psPolynomial1D* *) psAlloc(maxChebyPoly * sizeof(psPolynomial1D* ));
+    chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *));
     for (i = 0; i < maxChebyPoly; i++) {
-        chebPolys[i] = psPolynomial1DAlloc(i + 1);
+        chebPolys[i] = psPolynomial1DAlloc(i + 1, PS_POLYNOMIAL_ORD);
     }
 
@@ -333 +333 @@
     int i = 0;
     int j = 0;
-    float **sums = NULL;
+    //    float **sums = NULL;
     psPolynomial1D* *chebPolys = NULL;
     int maxChebyPoly = 0;
@@ -340 +340 @@
     float polySum = 0.0;
 
-    // Create the sums[][] data structure.  This
-    // will hold the LHS of
-    // equation
-    // 29 in the ADD: sums[k][l] = SUM {
-    // image(x,y) * Tk(x) * Tl(y) }
-    sums = (float **)psAlloc(coeffs->nX * sizeof(float *));
-    for (i = 0; i < coeffs->nX; i++) {
-        sums[i] = (float *)psAlloc(coeffs->nY * sizeof(float));
-    }
-    for (i = 0; i < coeffs->nX; i++) {
-        for (j = 0; j < coeffs->nY; j++) {
-            sums[i][j] = 0.0;
-        }
-    }
+    // Create the sums[][] data structure.  This will hold the LHS of
+    // equation 29 in the ADD:
+    //         sums[k][l] = SUM { image(x,y) * Tk(x) * Tl(y) }
+    //
+    //    sums = (float **)psAlloc(coeffs->nX * sizeof(float *));
+    //    for (i = 0; i < coeffs->nX; i++) {
+    //        sums[i] = (float *)psAlloc(coeffs->nY * sizeof(float));
+    //    }
+    //    for (i = 0; i < coeffs->nX; i++) {
+    //        for (j = 0; j < coeffs->nY; j++) {
+    //            sums[i][j] = 0.0;
+    //        }
+    //    }
 
     // We scale the pixel positions to values
@@ -375 +374 @@
                 for (j = 0; j < coeffs->nY; j++) {
                     polySum +=
-                        psPolynomial1DEval
-                        (rScalingFactors[x],
-                         chebPolys[i]) *
-                        psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) * coeffs->coeff[i][j];
+                        psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
+                        psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) *
+                        coeffs->coeff[i][j];
 
                 }
@@ -394 +392 @@
 
     // Free some data
-    for (i = 0; i < coeffs->nX; i++) {
-        psFree(sums[i]);
-    }
-    psFree(sums);
+    //    for (i = 0; i < coeffs->nX; i++) {
+    //        psFree(sums[i]);
+    //    }
+    //    psFree(sums);
     psFree(cScalingFactors);
     psFree(rScalingFactors);