Changeset 27839 for branches/simmosaic_branches/Ohana/src/libdvo/src/dvo_image_raw.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/libdvo/src/dvo_image_raw.c (modified) (10 diffs)

branches/simmosaic_branches/Ohana/src/libdvo/src/dvo_image_raw.c

@@ -7 +7 @@
 int dvo_image_load_raw (FITS_DB *db, int VERBOSE, int FORCE_READ) {
 
-  int Nimage, Ndata, size, ImageSize, nbytes, Nbytes;
+  off_t Nimage, Ndata, size, ImageSize, nbytes, Nbytes;
   struct stat filestatus;
   char format[80], telescope[80];
@@ -39 +39 @@
   /* find number of images */
   Nimage = 0;
-  gfits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimage);
+  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
   if (stat (db[0].filename, &filestatus) == -1) {
     if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
@@ -56 +56 @@
   if (db[0].format == DVO_FORMAT_PS1_DEV_3)       ImageSize = sizeof(Image_PS1_DEV_3);
   if (db[0].format == DVO_FORMAT_PS1_V1)          ImageSize = sizeof(Image_PS1_V1);
+  if (db[0].format == DVO_FORMAT_PS1_V2)          ImageSize = sizeof(Image_PS1_V2);
   if (db[0].format == DVO_FORMAT_PS1_REF)         ImageSize = sizeof(Image_PS1_REF);
 
   /* check that filesize makes sense */
-  size = Nimage*ImageSize + db[0].header.size;
+  size = Nimage*ImageSize + db[0].header.datasize;
   if (size != filestatus.st_size) {
-    Ndata = (filestatus.st_size - db[0].header.size) / ImageSize;
+    Ndata = (filestatus.st_size - db[0].header.datasize) / ImageSize;
     if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
-    if (VERBOSE) fprintf (stderr, "header: %d, data: %d\n", Nimage, Ndata);
+    if (VERBOSE) fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata);
     if (!FORCE_READ) exit (1);
     Nimage = Ndata;
@@ -83 +84 @@
   if (db[0].format == DVO_FORMAT_PS1_DEV_3)       gfits_table_mkheader_Image_PS1_DEV_3 (&db[0].theader);
   if (db[0].format == DVO_FORMAT_PS1_V1)          gfits_table_mkheader_Image_PS1_V1 (&db[0].theader);
+  if (db[0].format == DVO_FORMAT_PS1_V2)          gfits_table_mkheader_Image_PS1_V2 (&db[0].theader);
   if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_table_mkheader_Image_PS1_REF (&db[0].theader);
     
@@ -94 +96 @@
   } 
 
-  gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Nimage);
+  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
   db[0].theader.Naxis[1] = Nimage;
-  db[0].ftable.size = gfits_data_size (&db[0].theader);
+  db[0].ftable.datasize = gfits_data_size (&db[0].theader);
   db[0].swapped = FALSE;  /* table does not have internal byte-order */
   return (TRUE);
@@ -104 +106 @@
 int dvo_image_update_raw (FITS_DB *db, int VERBOSE) {
 
-  int i, Nx, Ny, Nrow, Nbytes;
-  int status, start, offset;
-  int *row;
+  off_t i, Nx, Ny, Nrow, Nbytes, start, offset;
+  off_t status;
+  off_t *row;
 
-  if (VERBOSE) fprintf (stderr, "writing out %d images\n", db[0].vtable.Nrow);
+  if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].vtable.Nrow);
 
   /* position to start of file */
-  Fseek (db[0].f, 0, SEEK_SET);
+  fseeko (db[0].f, 0, SEEK_SET);
   
   /* write out complete header (no check on disk size?) */
-  status = fwrite (db[0].header.buffer, 1, db[0].header.size, db[0].f);
-  if (status != db[0].header.size) {
+  status = fwrite (db[0].header.buffer, 1, db[0].header.datasize, db[0].f);
+  if (status != db[0].header.datasize) {
     fprintf (stderr, "ERROR: failed writing data to image header\n");
     exit (1);
@@ -123 +125 @@
   Nrow = db[0].vtable.Nrow;
   row = db[0].vtable.row;
-  gfits_scan (db[0].vtable.header, "NAXIS1", "%d", 1, &Nx);
-  gfits_scan (db[0].vtable.header, "NAXIS2", "%d", 1, &Ny);
+  gfits_scan (db[0].vtable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (db[0].vtable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
 
   /* file pointer is at beginning of desired table data */
@@ -131 +133 @@
   for (i = 0; i < Nrow; i++) {
     offset = start + Nx*row[i];
-    fseek (db[0].f, offset, SEEK_SET);
+    fseeko (db[0].f, offset, SEEK_SET);
     Nbytes = fwrite (db[0].vtable.buffer[i], sizeof (char), Nx, db[0].f);
     if (Nbytes != Nx) { return (FALSE); }
@@ -141 +143 @@
 int dvo_image_save_raw (FITS_DB *db, int VERBOSE) {
 
-  int status, Nx, Ny, size, Nbytes;
+  off_t Nx, Ny, size, Nbytes;
+  int status;
 
-  if (VERBOSE) fprintf (stderr, "writing out %d images\n", db[0].theader.Naxis[1]);
+  if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].theader.Naxis[1]);
 
   /* position to start of file */
@@ -149 +152 @@
   
   /* write out complete header (no check on disk size?) */
-  status = fwrite (db[0].header.buffer, 1, db[0].header.size, db[0].f);
-  if (status != db[0].header.size) {
+  status = fwrite (db[0].header.buffer, 1, db[0].header.datasize, db[0].f);
+  if (status != db[0].header.datasize) {
     fprintf (stderr, "ERROR: failed writing data to image header\n");
     exit (1);
   }
 
-  gfits_scan (db[0].ftable.header, "NAXIS1", "%d", 1, &Nx);
-  gfits_scan (db[0].ftable.header, "NAXIS2", "%d", 1, &Ny);
+  gfits_scan (db[0].ftable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (db[0].ftable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
   size = Nx * Ny;
   Nbytes = fwrite (db[0].ftable.buffer, sizeof(char), size, db[0].f);