Index: trunk/psphot/src/psphotBasicDeblend.c
===================================================================
--- trunk/psphot/src/psphotBasicDeblend.c	(revision 6481)
+++ trunk/psphot/src/psphotBasicDeblend.c	(revision 6715)
@@ -37,5 +37,5 @@
 	source = sources->data[N];
 
-	if (source->mode & PM_SOURCE_BLEND) continue;
+	if (source->mode & PM_SOURCE_MODE_BLEND) continue;
 
 	// temporary array for overlapping objects we find
@@ -89,5 +89,5 @@
 
 	// generate a basic contour (set of x,y coordinates at-or-below flux level)
-	psArray *contour = pmSourceContour_EAM (source->pixels, source->peak->x, source->peak->y, threshold);
+	psArray *contour = pmSourceContour (source->pixels, source->peak->x, source->peak->y, threshold);
 	if (contour == NULL) {
 	    psFree (overlap);
@@ -110,5 +110,5 @@
 		if (xv->data.F32[j+1] < testSource->peak->x) break;
 
-		testSource->mode |= PM_SOURCE_BLEND;
+		testSource->mode |= PM_SOURCE_MODE_BLEND;
 
 		// add this to the list of source->blends