Changeset 27838 for branches/tap_branches/Ohana/src/libfits/table/F_table_row.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/libfits/table/F_table_row.c (modified) (7 diffs)

branches/tap_branches/Ohana/src/libfits/table/F_table_row.c

@@ -3 +3 @@
 
 /*********************** fits table column ****************************/
-int gfits_add_rows (FTable *table, char *data, int Nrow, int Nbytes) {
+int gfits_add_rows (FTable *table, char *data, off_t Nrow, off_t Nbytes) {
 
-  int Nx, Ny;
-  int nbytes, Nstart;
+  off_t Nx, Ny;
+  off_t nbytes, Nstart;
   Header *header;
 
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -23 +23 @@
   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));
-  table[0].size = nbytes;
+  table[0].datasize = nbytes;
   
   memcpy (&table[0].buffer[Nstart], data, Nbytes*Nrow);
@@ -35 +35 @@
 
 /*********************** fits add (real) rows to virtual table ****************************/
-int gfits_vadd_rows (VTable *table, char *data, int Nrow, int Nbytes) {
+int gfits_vadd_rows (VTable *table, char *data, off_t Nrow, off_t Nbytes) {
 
-  int i, Nx, Ny;
-  int Nstart;
+  off_t i, Nx, Ny;
+  off_t Nstart;
   Header *header;
 
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -54 +54 @@
   table[0].Nrow += Nrow;
   REALLOCATE (table[0].buffer, char *, table[0].Nrow);
-  REALLOCATE (table[0].row, int, table[0].Nrow);
+  REALLOCATE (table[0].row, off_t, table[0].Nrow);
   for (i = 0; i < Nrow; i++) {
     ALLOCATE (table[0].buffer[Nstart+i], char, MAX (1, Nx));
@@ -64 +64 @@
   Ny += Nrow;
   header[0].Naxis[1] = Ny;
-  gfits_modify (header, "NAXIS2",  "%d", 1, Ny);
+  gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
 
-  table[0].size   = gfits_data_size (table[0].header);
-  table[0].pad    = table[0].size - Nx*Ny;
+  table[0].datasize = gfits_data_size (table[0].header);
+  table[0].pad      = table[0].datasize - Nx*Ny;
 
   return (TRUE);
@@ -73 +73 @@
 
 /*********************** fits table column ****************************/
-int gfits_delete_rows (FTable *table, int Nstart, int Nrow) {
+int gfits_delete_rows (FTable *table, off_t Nstart, off_t Nrow) {
 
-  int Nx, Ny, N0, N1, N2;
-  int nbytes;
+  off_t Nx, Ny, N0, N1, N2;
+  off_t nbytes;
   Header *header;
 
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -97 +97 @@
   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));
-  table[0].size = nbytes;
+  table[0].datasize = nbytes;
   return (TRUE);
 }