Changeset 30656 for trunk/ppTranslate/src/ppMopsMerge.c

Timestamp:

Feb 16, 2011, 4:11:29 PM (15 years ago)

Author:

Serge CHASTEL

Message:

Implicit conversion fixes

File:

• trunk/ppTranslate/src/ppMopsMerge.c (modified) (2 diffs)

trunk/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);
 }
 
@@ -170 +170 @@
     psTrace("ppMops.merge", 2, "%ld sources in merged detections list\n", merged->num);
 
-    merged->seeing /= num;
+    merged->seeing /= (float) num;
 
     return merged;