Changeset 26845 for branches/eam_branches/20091201/psModules/src/detrend/pmPattern.c

Timestamp:

Feb 10, 2010, 11:37:30 AM (16 years ago)

Author:

Paul Price

Message:

Fix confusion between columns in the image and columns in the correction.

File:

• branches/eam_branches/20091201/psModules/src/detrend/pmPattern.c (modified) (2 diffs)

branches/eam_branches/20091201/psModules/src/detrend/pmPattern.c

@@ -158 +158 @@
     int numCols = image->numCols, numRows = image->numRows; // Size of image
 
-    psPolynomial1D *poly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, numCols - 1); // Polynomial to apply
+    if (corr->numRows != numRows) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Number of rows of image (%d) does not match number of rows of pattern correction (%d)\n",
+                numRows, corr->numRows);
+        return false;
+    }
+
+    int order = corr->numCols - 1;                                        // Polynomial order
+    psPolynomial1D *poly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, order); // Polynomial to apply
     psVector *indices = psVectorAlloc(numCols, PS_TYPE_F32); // Indices for polynomial
     float norm = 2.0 / (float)numCols;  // Normalisation for indices
@@ -166 +174 @@
 
     for (int y = 0; y < numRows; y++) {
-        memcpy(poly->coeff, corr->data.F64[y], numCols * PSELEMTYPE_SIZEOF(PS_TYPE_F64));
+        memcpy(poly->coeff, corr->data.F64[y], order * PSELEMTYPE_SIZEOF(PS_TYPE_F64));
         psVector *solution = psPolynomial1DEvalVector(poly, indices); // Solution vector
         if (!solution) {