Changeset 28030 for branches/czw_branch/20100427/psModules/src/objects/pmPhotObj.c

Timestamp:

May 19, 2010, 2:09:25 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/czw_branch/20100427/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmPhotObj.c (modified) (1 diff)

branches/czw_branch/20100427/psModules/src/objects/pmPhotObj.c

@@ -58 +58 @@
     if (!object->sources) {
         object->sources = psArrayAllocEmpty(1);
-        object->x = source->peak->xf;
-        object->y = source->peak->yf;
+        object->x  = source->peak->xf;
+        object->y  = source->peak->yf;
+        object->SN = source->peak->SN;
+    } else {
+        object->SN = PS_MAX(object->SN, source->peak->SN);
     }
     psArrayAdd (object->sources, 1, source);
     return true;
 }
+
+// sort by SN (descending)
+int pmPhotObjSortBySN (const void **a, const void **b)
+{
+    pmPhotObj *objA = *(pmPhotObj **)a;
+    pmPhotObj *objB = *(pmPhotObj **)b;
+
+    psF32 fA = objA->SN;
+    psF32 fB = objB->SN;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (-1);
+    if (diff < FLT_EPSILON) return (+1);
+    return (0);
+}