Changeset 7612

Timestamp:

Jun 21, 2006, 11:03:49 AM (20 years ago)

Author:

drobbin

Message:

Edited psImageFitPoly and EvalPoly. Scaling factors were using incorrect indices. Test output still questionable but matches verified folder.

Location:

trunk/psLib

Files:

• src/imageops/psImageStats.c (modified) (4 diffs)
• test/imageops/tst_psImageStats.c (modified) (1 diff)

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-13 20:02:05 $
+ *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 21:03:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -301 +301 @@
                         pixel = input->data.F64[y][x];
                     }
-                    sums[i][j] += pixel * psPolynomial1DEval(chebPolys[i],rScalingFactors[x]) *
-                                  psPolynomial1DEval(chebPolys[j], cScalingFactors[y]);
+                    sums[i][j] += pixel * psPolynomial1DEval(chebPolys[i],rScalingFactors[y]) *
+                                  psPolynomial1DEval(chebPolys[j], cScalingFactors[x]);
                 }
             }
@@ -376 +376 @@
                 for (long j = 0; j < (1 + coeffs->nY); j++) {
                     polySum +=
-                        psPolynomial1DEval(chebPolys[i], rScalingFactors[x]) *
-                        psPolynomial1DEval(chebPolys[j], cScalingFactors[y]) *
+                        psPolynomial1DEval(chebPolys[i], rScalingFactors[y]) *
+                        psPolynomial1DEval(chebPolys[j], cScalingFactors[x]) *
                         coeffs->coeff[i][j];
                 }
@@ -592 +592 @@
         return -1;
     }/* else if (col0 == col1 && row0 == row1) {
-                                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                                        "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-                                return -1;
-                            }
-                        */
+                                    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                                            "Invalid psRegion specified.  Region contains only 1 pixel.\n");
+                                    return -1;
+                                }
+                            */
     x0 = col0;
     x1 = col1;

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -264 +264 @@
         for ( j = 0;j < CHEBY_Y_DIM;j++ ) {
             fprintf(stderr, "Cheby Polynomial (%d, %d) coefficient is %.2f\n", i, j,
-                    0.0001f+my2DPoly->coeff[ j ][ i ] );
+                    0.0001f+my2DPoly->coeff[ i ][ j ] );
         }
     }