IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 6, 2010, 4:06:31 PM (16 years ago)
Author:
eugene
Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:
trunk/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

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

    r27435 r28241  
    130130  off_t i, Nx, Ny;
    131131
    132   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    133   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     132  gfits_scan (ftable[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     133  gfits_scan (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    134134 
    135135  if (start + Nkeep > Ny) return (FALSE);
    … …  
    158158  off_t i, N, Nx, Ny;
    159159
    160   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    161   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     160  gfits_scan (ftable[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     161  gfits_scan (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    162162
    163163  /* make empty vtable from table */
    … …  
    191191  va_start (argp, table);
    192192
    193   gfits_scan (table[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     193  gfits_scan (table[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
    194194  gfits_scan (table[0].header, "TFIELDS", "%d", 1, &Nfields);
    195195
    … …  
    236236  off = 0;
    237237
    238   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    239   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     238  gfits_scan (ftable[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     239  gfits_scan (ftable[0].header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    240240  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    241241
    … …  
    320320  off = 0;
    321321
    322   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    323   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     322  gfits_scan (ftable[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     323  gfits_scan (ftable[0].header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    324324  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    325325
Note: See TracChangeset for help on using the changeset viewer.