IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/libfits/table/F_define_column.c

    r26384 r27435  
    55int gfits_define_bintable_column (Header *header, char *format, char *label, char *comment, char *unit, double bscale, double bzero) {
    66
    7   int Nfields, Nbytes, Nval, Naxis1;
     7  off_t Naxis1;
     8  int Nfields, Nbytes, Nval;
    89  char type[16], field[16];
    910 
    … …  
    1213  Nfields = 0;
    1314  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    14   gfits_scan (header, "NAXIS1",  "%d", 1, &Naxis1);
     15  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
    1516  Nfields ++;
    1617  Naxis1 += Nbytes*Nval;
    … …  
    1819  sprintf (field, "TTYPE%d", Nfields);
    1920  gfits_modify (header, field, "%s", 1, label);
    20   gfits_modify (header, field, "%C", 1, comment);
     21  gfits_modify_alt (header, field, "%C", 1, comment);
    2122  sprintf (field, "TUNIT%d", Nfields);
    2223  gfits_modify (header, field, "%s", 1, unit);
    … …  
    3435  /* update TFIELDS & NAXIS1 */
    3536  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    36   gfits_modify (header, "NAXIS1",  "%d", 1, Naxis1);
     37  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
    3738  header[0].Naxis[0] = Naxis1;
    3839
    … …  
    4344int gfits_define_table_column (Header *header, char *format, char *label, char *comment, char *unit) {
    4445
    45   int Nstart, Nfields, Nbytes, Nval, Naxis1;
     46  off_t Naxis1;
     47  int Nstart, Nfields, Nbytes, Nval;
    4648  char type[16], field[16], cformat[16];
    4749
    … …  
    5153  Nfields = 0;
    5254  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    53   gfits_scan (header, "NAXIS1",  "%d", 1, &Naxis1);
     55  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
    5456  Nstart = Naxis1 + 1;
    5557  Nfields ++;
    … …  
    5860  sprintf (field, "TTYPE%d", Nfields);
    5961  gfits_modify (header, field, "%s", 1, label);
    60   gfits_modify (header, field, "%C", 1, comment);
     62  gfits_modify_alt (header, field, "%C", 1, comment);
    6163  sprintf (field, "TUNIT%d", Nfields);
    6264  gfits_modify (header, field, "%s", 1, unit);
    … …  
    6870
    6971  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    70   gfits_modify (header, "NAXIS1",  "%d", 1, Naxis1);
     72  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
    7173  header[0].Naxis[0] = Naxis1;
    7274
Note: See TracChangeset for help on using the changeset viewer.