Changeset 27839 for branches/simmosaic_branches/Ohana/src/opihi/dvo/imrough.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/imrough.c (modified) (6 diffs)

branches/simmosaic_branches/Ohana/src/opihi/dvo/imrough.c

@@ -1 +1 @@
 # include "dvoshell.h"
-RegImage *load_imreg (char *DataBase, int *nimage);
+RegImage *load_imreg (char *DataBase, off_t *nimage);
 
 # define NVALUE 22
@@ -8 +8 @@
 int imrough (int argc, char **argv) {
  
-  int i, N, Nimage, TimeSelect;
+  off_t i, Nimage;
+  int N, TimeSelect;
   int ModeSelect, TypeSelect, CCDSelect, FilterSelect, TimeFormat;
   int type, value, mode, CCD, NVEC;
@@ -231 +232 @@
 }
 
-RegImage *load_imreg (char *DataBase, int *nimage) {
-
-  int Nimage, status;
+RegImage *load_imreg (char *DataBase, off_t *nimage) {
+
+  off_t Nimage;
+  int status;
   char line[80];
   FILE *f;
@@ -262 +264 @@
   if (!strcmp (line, "MDM Observatory")) {
 
-    fseek (f, header.size, SEEK_SET);
+    fseeko (f, header.datasize, SEEK_SET);
     
     /* load existing data from database */
-    gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
+    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     ALLOCATE (image, RegImage, Nimage);
     status = fread (image, sizeof(RegImage), Nimage, f);
@@ -271 +273 @@
     
     if (status != Nimage) {
-      gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
+      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
       gfits_free_header (&header);
       free (image);
@@ -302 +304 @@
   /* convert to internal format */
   image = (RegImage *) table.buffer;
-  gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
+  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
   gfits_convert_RegImage (image, sizeof (RegImage), Nimage);