Changeset 5718 for trunk/psphot/src/pmSourceContour.c

Timestamp:

Dec 6, 2005, 9:55:31 PM (21 years ago)

Author:

eugene

Message:

finshed deblender, dropped local copies of psModule code

File:

• trunk/psphot/src/pmSourceContour.c (modified) (7 diffs)

trunk/psphot/src/pmSourceContour.c

@@ -100 +100 @@
 new implementation of source contour function
 *****************************************************************************/
-psArray *pmSourceContour_EAM (psImage *image, int x, int y, float threshold) {
+psArray *pmSourceContour_EAM (psImage *image, int xc, int yc, float threshold) {
 
     int xR, yR, x0, x1, x0s, x1s;
@@ -106 +106 @@
     psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(image, false);
+
+    int x = xc - image->col0;
+    int y = yc - image->row0;
 
     // the requested point must be within the contour
@@ -141 +144 @@
             x0 = findContourPos (image, threshold, xR, yR, RIGHT, x1);
             if (x0 == x1) {
-                fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
+                // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
                 goto pt1;
             }
@@ -150 +153 @@
             x1 = findContourNeg (image, threshold, xR, yR, RIGHT);
         }
-        fprintf (stderr, "pos: %d (%d - %d)\n", yR, x0, x1);
+        // fprintf (stderr, "pos: %d (%d - %d)\n", yR, x0, x1);
 
         xVec->data.F32[Npt + 0] = image->col0 + x0;
@@ -175 +178 @@
             x0 = findContourPos (image, threshold, xR, yR, RIGHT, x1);
             if (x0 == x1) {
-                fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
+                // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
                 goto pt2;
             }
@@ -184 +187 @@
             x1 = findContourNeg (image, threshold, xR, yR, RIGHT);
         }
-        fprintf (stderr, "neg: %d (%d - %d)\n", yR, x0, x1);
+        // fprintf (stderr, "neg: %d (%d - %d)\n", yR, x0, x1);
 
         xVec->data.F32[Npt + 0] = image->col0 + x0;
@@ -202 +205 @@
     yVec->n = Npt;
 
-    fprintf (stderr, "done\n");
+    // fprintf (stderr, "done\n");
     psArray *tmpArray = psArrayAlloc(2);
     tmpArray->data[0] = (psPtr *) xVec;