Changeset 26562 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Jan 12, 2010, 12:11:55 PM (17 years ago)

Author:

Paul Price

Message:

Dual convolution working properly. Reworked the math to be more simple: carrying around a single matrix for the stamps now. Masking terms in the solution when doing dual convolution doesn't work as well as using a penalty function, so disabled, soon to be removed completely. Resolved conflicts.

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtraction.c (modified) (1 diff)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtraction.c

@@ -907 +907 @@
                 psFree(stamp->weight);
                 stamp->image1 = stamp->image2 = stamp->weight = NULL;
-                psFree(stamp->matrix1);
-                psFree(stamp->matrix2);
-                psFree(stamp->matrixX);
-                stamp->matrix1 = stamp->matrix2 = stamp->matrixX = NULL;
-                psFree(stamp->vector1);
-                psFree(stamp->vector2);
-                stamp->vector1 = stamp->vector2 = NULL;
+                psFree(stamp->matrix);
+                stamp->matrix = NULL;
+                psFree(stamp->vector);
+                stamp->vector = NULL;
             } else {
                 numGood++;