Changeset 26390

Timestamp:

Dec 11, 2009, 6:42:54 PM (16 years ago)

Author:

bills

Message:

more fixes for the !$#!%@#$% MacOS ;)

Location:

trunk/Ohana/src/addstar/src

Files:

• LoadData.c (modified) (1 diff)
• UpdateImageIDs.c (modified) (1 diff)
• psps_ids.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/LoadData.c

@@ -62 +62 @@
         // This image is the parent of subsequent images
         parentID = Nvalid;
-        images[0][Nvalid].parentID = UINT_MAX;
+        images[0][Nvalid].parentID = UINT32_MAX;
       }
       Nvalid++;

trunk/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -40 +40 @@
   for (i = 0; i < Nimages; i++) {
     images[i].imageID += imageID;
-    if (images[i].parentID == UINT_MAX) {
+    if (images[i].parentID == UINT32_MAX) {
         images[i].parentID = 0;
     } else {

trunk/Ohana/src/addstar/src/psps_ids.c

@@ -27 +27 @@
 
     uint64_t part1, part2, part3;
-    part1 = (uint64_t)( izone  * 10000000000000) ; 
+    part1 = (uint64_t)( izone  * 10000000000000LL) ; 
     part2 = ((uint64_t)(ra * 1000000.)) * 10000 ; // 0 - 360*1e6 = 3.6e8 (< 29 bits)
     part3 = (int) (zresid * 10000.0) ; // 0 - 10000 (1 bit == 30/10000 arcsec) (< 14 bits)