Changeset 21183 for trunk/psModules/src/imcombine/pmStackReject.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psModules/src/imcombine/pmStackReject.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmStackReject.c

@@ -61 +61 @@
         }
 
-        int numBytes = (xMax - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_MASK); // Number of bytes to copy
+        int numBytes = (xMax - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_IMAGE_MASK); // Number of bytes to copy
         psAssert(convolved->numCols - 2 * box == xMax - xMin, "Bad number of columns");
         psAssert(convolved->numRows - 2 * box == yMax - yMin, "Bad number of rows");
 
         for (int yTarget = yMin, ySource = box; yTarget < yMax; yTarget++, ySource++) {
-            memcpy(&target->data.PS_TYPE_MASK_DATA[yTarget][xMin],
-                   &convolved->data.PS_TYPE_MASK_DATA[ySource][box], numBytes);
+            memcpy(&target->data.PS_TYPE_IMAGE_MASK_DATA[yTarget][xMin],
+                   &convolved->data.PS_TYPE_IMAGE_MASK_DATA[ySource][box], numBytes);
         }
         psFree(convolved);
     } else {
         // Just copy over
-        int numBytes = (xMax - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_MASK); // Number of bytes to copy
+        int numBytes = (xMax - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_IMAGE_MASK); // Number of bytes to copy
         for (int yTarget = yMin; yTarget < yMax; yTarget++) {
-            memcpy(&target->data.PS_TYPE_MASK_DATA[yTarget][xMin],
-                   &source->data.PS_TYPE_MASK_DATA[yTarget][xMin], numBytes);
+            memcpy(&target->data.PS_TYPE_IMAGE_MASK_DATA[yTarget][xMin],
+                   &source->data.PS_TYPE_IMAGE_MASK_DATA[yTarget][xMin], numBytes);
         }
     }
@@ -262 +262 @@
     bool oldThreads = psImageConvolveSetThreads(false); // Old value of threading for psImageColvolve
 
-    psImage *target = psImageRecycle(convolved, numCols, numRows, PS_TYPE_MASK); // Grown image
+    psImage *target = psImageRecycle(convolved, numCols, numRows, PS_TYPE_IMAGE_MASK); // Grown image
     psImageInit(target, 0);
     if (threaded) {