Changeset 25766 for branches/eam_branches/20090820/psModules/src/objects/pmGrowthCurveGenerate.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmGrowthCurveGenerate.c (modified) (2 diffs)

branches/eam_branches/20090820/psModules/src/objects/pmGrowthCurveGenerate.c

@@ -65 +65 @@
 
             // use the center of the center pixel of the image
+            // 0.5 PIX: is this offset needed? probably -- the psf model uses 0.5,0.5 as the center, double check
             float xc = (int)(ix*readout->image->numCols + 0.5*readout->image->numCols) + readout->image->col0 + 0.5;
             float yc = (int)(iy*readout->image->numRows + 0.5*readout->image->numRows) + readout->image->row0 + 0.5;
@@ -195 +196 @@
             return NULL;
         }
-        psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+        psImageMaskPixels (mask, "AND", PS_NOT_IMAGE_MASK(markVal)); // clear the circular mask
 
         // the 'ignore' mode is for testing