Changeset 30631 for branches/czw_branch/20101203/psModules/src/imcombine/pmSubtractionParams.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionParams.c (modified) (2 diffs)

branches/czw_branch/20101203/psModules/src/imcombine/pmSubtractionParams.c

@@ -9 +9 @@
 
 #include "pmErrorCodes.h"
+#include "pmFPA.h"
+#include "pmSubtractionTypes.h"
+#include "pmSubtraction.h"
 #include "pmSubtractionStamps.h"
-#include "pmSubtraction.h"
 #include "pmSubtractionParams.h"
 
@@ -16 +18 @@
 
 #if 0
+// XXX this was moved to pmSubtraction.c in r15443 -- delete 
 // Convolve the reference stamp by the kernel
 static psKernel *convolveStamp(const pmSubtractionStamp *stamp, // Stamp to be convolved