Changeset 30675 for branches/eam_branches/ipp-20110213/ppTranslate/src/ppMopsMerge.c

Timestamp:

Feb 17, 2011, 3:19:36 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

File:

• branches/eam_branches/ipp-20110213/ppTranslate/src/ppMopsMerge.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/ppTranslate/src/ppMopsMerge.c

@@ -22 +22 @@
     )
 {
-    float dx = detections->x->data.F32[index] - detections->naxis1->data.S32[index] / 2.0;
-    float dy = detections->y->data.F32[index] - detections->naxis2->data.S32[index] / 2.0;
-    return PS_SQR(dx) + PS_SQR(dy);
+  float dx = (float) (detections->x->data.F32[index] - detections->naxis1->data.S32[index] / 2.0);
+  float dy = (float) (detections->y->data.F32[index] - detections->naxis2->data.S32[index] / 2.0);
+  return PS_SQR(dx) + PS_SQR(dy);
 }
 
@@ -165 +165 @@
     if (num == 0) {
         //All detections were NULL?!
-        psTrace("ppMops.merge", 3, "All %d detections were NULL\n", detections->n);
+        psTrace("ppMops.merge", 3, "All %ld detections were NULL\n", detections->n);
         return NULL;
     }
     psTrace("ppMops.merge", 2, "%ld sources in merged detections list\n", merged->num);
 
-    merged->seeing /= num;
+    merged->seeing /= (float) num;
 
     return merged;