Changeset 27435 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_set_column.c (modified) (4 diffs)

trunk/Ohana/src/libfits/table/F_set_column.c

@@ -16 +16 @@
 
 /***********************/
-int gfits_set_bintable_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
-
-  int i, N, Nfields, Nval, Nbytes, Nx, Ny, nbytes, Nstart, Nv, Nb;
+int gfits_set_bintable_column (Header *header, FTable *table, char *label, void *data, off_t Nrow) {
+
+  off_t Nx, Ny, nbytes;
+  int i, N, Nfields;
+  int Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], type[16], tmpline[16];
   char *Pin, *Pout, *array;
@@ -47 +49 @@
   
   /* check existing table dimensions */
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    gfits_modify (header, "NAXIS2",  "%d", 1, Ny);
+    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
 
     nbytes = gfits_data_size (header);
     REALLOCATE (table[0].buffer, char, MAX (nbytes, 1));
     bzero (table[0].buffer, nbytes);
-    table[0].size = nbytes;
+    table[0].datasize = nbytes;
   }
   if (Ny != Nrow) return (FALSE);
@@ -151 +153 @@
 
 /***********************/
-int gfits_set_table_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
-
-  int i, N, Nfields, Nval, Nbytes, Nx, Ny, nbytes, Nstart, Nv, Nb;
+int gfits_set_table_column (Header *header, FTable *table, char *label, void *data, off_t Nrow) {
+
+  off_t Nx, Ny, nbytes;
+  int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], cformat[80], type[16], tmp[16];
   char *array, *Pin, *Pout, *line;
@@ -178 +181 @@
   
   /* check existing table dimensions */
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    gfits_modify (header, "NAXIS2",  "%d", 1, Ny);
+    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
 
     nbytes = gfits_data_size (header);
     REALLOCATE (table[0].buffer, char, MAX (nbytes, 1));
     bzero (table[0].buffer, nbytes);
-    table[0].size = nbytes;
+    table[0].datasize = nbytes;
   }
   if (Ny != Nrow) return (FALSE);