Changeset 21363 for trunk/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (7 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -54 +54 @@
     psFree(stamp->image1);
     psFree(stamp->image2);
-    psFree(stamp->weight);
+    psFree(stamp->variance);
     psFree(stamp->convolutions1);
     psFree(stamp->convolutions2);
@@ -211 +211 @@
     stamp->image1 = NULL;
     stamp->image2 = NULL;
-    stamp->weight = NULL;
+    stamp->variance = NULL;
     stamp->convolutions1 = NULL;
     stamp->convolutions2 = NULL;
@@ -333 +333 @@
                 psFree(stamp->image1);
                 psFree(stamp->image2);
-                psFree(stamp->weight);
+                psFree(stamp->variance);
                 psFree(stamp->convolutions1);
                 psFree(stamp->convolutions2);
-                stamp->image1 = stamp->image2 = stamp->weight = NULL;
+                stamp->image1 = stamp->image2 = stamp->variance = NULL;
                 stamp->convolutions1 = stamp->convolutions2 = NULL;
 
@@ -480 +480 @@
 
 bool pmSubtractionStampsExtract(pmSubtractionStampList *stamps, psImage *image1, psImage *image2,
-                                psImage *weight, int kernelSize)
+                                psImage *variance, int kernelSize)
 {
     PM_ASSERT_SUBTRACTION_STAMP_LIST_NON_NULL(stamps, false);
@@ -490 +490 @@
         PS_ASSERT_IMAGE_TYPE(image2, PS_TYPE_F32, false);
     }
-    PS_ASSERT_IMAGE_NON_NULL(weight, false);
-    PS_ASSERT_IMAGES_SIZE_EQUAL(weight, image1, false);
-    PS_ASSERT_IMAGE_TYPE(weight, PS_TYPE_F32, false);
+    PS_ASSERT_IMAGE_NON_NULL(variance, false);
+    PS_ASSERT_IMAGES_SIZE_EQUAL(variance, image1, false);
+    PS_ASSERT_IMAGE_TYPE(variance, PS_TYPE_F32, false);
     PS_ASSERT_INT_NONNEGATIVE(kernelSize, false);
 
@@ -520 +520 @@
         assert(stamp->image1 == NULL);
         assert(stamp->image2 == NULL);
-        assert(stamp->weight == NULL);
+        assert(stamp->variance == NULL);
 
         psRegion region = psRegionSet(x - size, x + size + 1, y - size, y + size + 1); // Region of interest
@@ -534 +534 @@
         }
 
-        psImage *wtSub = psImageSubset(weight, region); // Subimage with stamp
-        stamp->weight = psKernelAllocFromImage(wtSub, size, size);
+        psImage *wtSub = psImageSubset(variance, region); // Subimage with stamp
+        stamp->variance = psKernelAllocFromImage(wtSub, size, size);
         psFree(wtSub);                  // Drop reference