Changeset 4954 for trunk/psphot/src/pmSourceUtils.c

Timestamp:

Sep 6, 2005, 5:33:01 PM (21 years ago)

Author:

eugene

Message:

psphot reorganization: merged in pmObjects code from psModule, modified to work with psLib 0.7.0

File:

• trunk/psphot/src/pmSourceUtils.c (modified) (1 diff)

trunk/psphot/src/pmSourceUtils.c

@@ -7 +7 @@
                           psF32 Radius)
 {
-    psRegion *srcRegion;
+    psRegion srcRegion;
 
     // Grab a subimage of the original image of size (2 * outerRadius).
-    srcRegion = psRegionSquare (x, y, Radius);
-    srcRegion = psRegionForImage (srcRegion, imdata->image, srcRegion);
+    srcRegion = psRegionForSquare (x, y, Radius);
+    srcRegion = psRegionForImage (imdata->image, &srcRegion);
 
-    //  use these when psImageSubset is updated
-    //  psImage *subImage = psImageSubset(imdata->image, srcRegion);
-    //  psImage *subImageMask = psImageSubset(imdata->mask, srcRegion);
-    //  psImage *subImageNoise = psImageSubset(imdata->noise, srcRegion);
+    mySource->pixels = psImageSubset(imdata->image, srcRegion);
+    mySource->noise  = psImageSubset(imdata->noise, srcRegion);
+    mySource->mask   = psImageSubset(imdata->mask,  srcRegion);
 
-    mySource->pixels = psImageSubset(imdata->image, srcRegion->x0, srcRegion->y0, srcRegion->x1, srcRegion->y1);
-    mySource->noise  = psImageSubset(imdata->noise, srcRegion->x0, srcRegion->y0, srcRegion->x1, srcRegion->y1);
-    mySource->mask   = psImageSubset(imdata->mask,  srcRegion->x0, srcRegion->y0, srcRegion->x1, srcRegion->y1);
-
-    psFree (srcRegion);
     return(mySource);
 }