Changeset 27838 for branches/tap_branches/Ohana/src/addstar/src/LoadStars.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/src/LoadStars.c (modified) (3 diffs)

branches/tap_branches/Ohana/src/addstar/src/LoadStars.c

@@ -1 +1 @@
 # include "addstar.h"
 
-Stars *LoadStars (char *filename, int *Nstars, Image **images, int *Nimages, AddstarClientOptions *options) {
+Stars *LoadStars (char *filename, unsigned int *Nstars, Image **images, off_t *Nimages, AddstarClientOptions *options) {
 
-  int i, Nfile, NFILE, Nheaders, NheaderSets, mode, *extsize;
+  off_t *extsize, NheaderSets;
+  int i, Nfile, NFILE, Nheaders, mode;
   char **file, line[1024];
   FILE *f;
@@ -80 +81 @@
       continue;
     }
-    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %d images\n", file[i], Nheaders, NheaderSets);
+    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %lld images\n", file[i], Nheaders, (long long) NheaderSets);
 
     /* supplied photcode is incompatible with multi-chip images */
@@ -94 +95 @@
     }
 
-    LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets);
+    LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets, options);
 
     // XXX add a function to (optionally) load the extended source measurements