Changeset 14739

Timestamp:

Sep 4, 2007, 2:15:28 PM (19 years ago)

Author:

Paul Price

Message:

Give pmSubtractionBorder a size, rather than the NULL kernel (since kernel is now dependent on the region, not the whole image, though the size is generally constant).

Location:

trunk/psModules/src/imcombine

Files:

• pmSubtraction.c (modified) (3 diffs)
• pmSubtraction.h (modified) (2 diffs)
• pmSubtractionMatch.c (modified) (1 diff)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-04 23:56:07 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-05 00:15:28 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -1139 +1139 @@
 
 bool pmSubtractionBorder(psImage *image, psImage *weight, psImage *mask,
-                         const pmSubtractionKernels *kernels, psMaskType blank)
+                         int size, psMaskType blank)
 {
     PS_ASSERT_IMAGE_NON_NULL(image, false);
@@ -1156 +1156 @@
     int numCols = image->numCols, numRows = image->numRows; // Image dimensions
 
-    int size = kernels->size;           // Half-size of kernel
     for (int y = size; y < numRows - size; y++) {
         for (int x = 0; x < size; x++) {

trunk/psModules/src/imcombine/pmSubtraction.h

@@ -6 +6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-04 23:56:07 $
+ * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-09-05 00:15:28 $
  *
  * Copyright 2004-207 Institute for Astronomy, University of Hawaii
@@ -96 +96 @@
                          psImage *weight, ///< Weight map (or NULL)
                          psImage *mask, ///< Mask (or NULL)
-                         const pmSubtractionKernels *kernels, ///< Kernel parameters (for kernel size)
+                         int size,      ///< Kernel half-size
                          psMaskType blank ///< Mask value for blank regions
     );

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -455 +455 @@
     stampsData = NULL;
 
-    if (!pmSubtractionBorder(convolved->image, convolved->weight, convolved->mask, kernels, maskBlank)) {
+    if (!pmSubtractionBorder(convolved->image, convolved->weight, convolved->mask, size, maskBlank)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to set border of convolved image.");
         goto ERROR;