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:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/libfits/header/F_create_H.c

    r27435 r28241  
    2323  for (i = 0; i < header[0].Naxes; i++) {
    2424    snprintf (axis, 10, "NAXIS%d", i + 1);
    25     gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
     25    gfits_modify (header,  axis, OFF_T_FMT, 1, header[0].Naxis[i]);
    2626  }
    2727

  • trunk/Ohana/src/libfits/header/F_modify.c

    r27435 r28241  
    5353  if (!strcmp (mode, "%d"))   snprintf (string, 81, "%-8s= %20d / %-s ",    field, va_arg (argp, int),                comment);
    5454  if (!strcmp (mode, "%ld"))  snprintf (string, 81, "%-8s= %20ld / %-s ",   field, va_arg (argp, long),               comment);
    55   if (!strcmp (mode, "%lld")) snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),          comment);
     55  if (!strcmp (mode, OFF_T_FMT)) snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),               comment);
    5656  if (!strcmp (mode, "%Ld"))  snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),          comment);
    5757  if (!strcmp (mode, "%u"))   snprintf (string, 81, "%-8s= %20u / %-s ",    field, va_arg (argp, unsigned),           comment);
    … …  
    6767  if (!strcmp (mode, "%lg"))  snprintf (string, 81, "%-8s= %20.10G / %-s ", field, va_arg (argp, double),             comment);
    6868
     69  if (!strcmp (mode, "%jd"))  snprintf (string, 81, "%-8s= %20jd / %-s ",   field, va_arg (argp, intmax_t),           comment);
     70
    6971  /* string value.  Quotes must be at least 18 chars apart */
    7072  if (!strcmp (mode, "%s")) {

  • trunk/Ohana/src/libfits/header/F_print.c

    r27435 r28241  
    4848  if (!strcmp (mode, "%d"))  { snprintf (string, 81, "%-8s= %20d / %46s ",    field, va_arg (argp, int),                blank); }
    4949  if (!strcmp (mode, "%ld")) { snprintf (string, 81, "%-8s= %20ld / %46s ",   field, va_arg (argp, long),               blank); }
    50   if (!strcmp (mode, "%lld")){ snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
     50  if (!strcmp (mode, OFF_T_FMT)){ snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
    5151  if (!strcmp (mode, "%Ld")) { snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
    5252  if (!strcmp (mode, "%u"))  { snprintf (string, 81, "%-8s= %20u / %46s ",    field, va_arg (argp, unsigned),           blank); }
    … …  
    6161  if (!strcmp (mode, "%g"))  { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
    6262  if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
     63
     64  if (!strcmp (mode, "%jd")) { snprintf (string, 81, "%-8s= %20jd / %46s ",   field, va_arg (argp, intmax_t),           blank); }
    6365
    6466  /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */

  • trunk/Ohana/src/libfits/header/F_read_H.c

    r27435 r28241  
    6969  gfits_scan (header,  "BZERO",  "%lf",  1, &header[0].bzero);
    7070                                       
    71   gfits_scan (header,  "NAXIS1", "%lld", 1, (long long *) &header[0].Naxis[0]);
    72   gfits_scan (header,  "NAXIS2", "%lld", 1, (long long *) &header[0].Naxis[1]);
    73   gfits_scan (header,  "NAXIS3", "%lld", 1, (long long *) &header[0].Naxis[2]);
    74   gfits_scan (header,  "NAXIS4", "%lld", 1, (long long *) &header[0].Naxis[3]);
    75   gfits_scan (header,  "NAXIS5", "%lld", 1, (long long *) &header[0].Naxis[4]);
    76   gfits_scan (header,  "NAXIS6", "%lld", 1, (long long *) &header[0].Naxis[5]);
    77   gfits_scan (header,  "NAXIS7", "%lld", 1, (long long *) &header[0].Naxis[6]);
    78   gfits_scan (header,  "NAXIS8", "%lld", 1, (long long *) &header[0].Naxis[7]);
    79   gfits_scan (header,  "NAXIS9", "%lld", 1, (long long *) &header[0].Naxis[8]);
    80   gfits_scan (header, "NAXIS10", "%lld", 1, (long long *) &header[0].Naxis[9]);
     71  gfits_scan (header,  "NAXIS1", OFF_T_FMT, 1, &header[0].Naxis[0]);
     72  gfits_scan (header,  "NAXIS2", OFF_T_FMT, 1, &header[0].Naxis[1]);
     73  gfits_scan (header,  "NAXIS3", OFF_T_FMT, 1, &header[0].Naxis[2]);
     74  gfits_scan (header,  "NAXIS4", OFF_T_FMT, 1, &header[0].Naxis[3]);
     75  gfits_scan (header,  "NAXIS5", OFF_T_FMT, 1, &header[0].Naxis[4]);
     76  gfits_scan (header,  "NAXIS6", OFF_T_FMT, 1, &header[0].Naxis[5]);
     77  gfits_scan (header,  "NAXIS7", OFF_T_FMT, 1, &header[0].Naxis[6]);
     78  gfits_scan (header,  "NAXIS8", OFF_T_FMT, 1, &header[0].Naxis[7]);
     79  gfits_scan (header,  "NAXIS9", OFF_T_FMT, 1, &header[0].Naxis[8]);
     80  gfits_scan (header, "NAXIS10", OFF_T_FMT, 1, &header[0].Naxis[9]);
    8181
    8282  if (!gfits_scan (header, "PCOUNT",  "%d", 1, &header[0].pcount)) {

  • trunk/Ohana/src/libfits/header/F_scan.c

    r27435 r28241  
    7676  if (!strcmp (mode, "%d"))   { *va_arg (argp, int *)                = value; return (TRUE); }
    7777  if (!strcmp (mode, "%ld"))  { *va_arg (argp, long *)               = value; return (TRUE); }
    78   if (!strcmp (mode, "%lld")) { *va_arg (argp, long long *)          = value; return (TRUE); }
     78  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, long long *)       = value; return (TRUE); }
    7979  if (!strcmp (mode, "%Ld"))  { *va_arg (argp, long long *)          = value; return (TRUE); }
    8080  if (!strcmp (mode, "%u"))   { *va_arg (argp, unsigned *)           = value; return (TRUE); }
    … …  
    8484  if (!strcmp (mode, "%hd"))  { *va_arg (argp, short *)              = value; return (TRUE); }
    8585
     86  // XXX is this safe for 64bit off_t and 32bit off_t?
     87  if (!strcmp (mode, "%jd"))  { *va_arg (argp, intmax_t *)           = value; return (TRUE); }
     88
    8689  /* no valid mode found */
    8790  return (FALSE);
    … …  
    219222  if (!strcmp (mode, "%d"))   { *va_arg (argp, int *)                = value; return (TRUE); }
    220223  if (!strcmp (mode, "%ld"))  { *va_arg (argp, long *)               = value; return (TRUE); }
    221   if (!strcmp (mode, "%lld")) { *va_arg (argp, long long *)          = value; return (TRUE); }
     224  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, long long *)       = value; return (TRUE); }
    222225  if (!strcmp (mode, "%Ld"))  { *va_arg (argp, long long *)          = value; return (TRUE); }
    223226  if (!strcmp (mode, "%u"))   { *va_arg (argp, unsigned *)           = value; return (TRUE); }

  • trunk/Ohana/src/libfits/include/gfitsio.h

    r27435 r28241  
    77# define GFITSIO
    88
    9 /* also defined in libautocode/def/common.h */
    10 /* what about lin64 ?? - 'linux' might be defined automatically by linux */
    119# ifndef BYTE_SWAP
    12 # ifdef linux
    13 # define BYTE_SWAP
     10# ifndef NOT_BYTE_SWAP
     11# error "neither BYTE_SWAP not NOT_BYTE_SWAP is set"
    1412# endif
    15 
    16 # ifdef sid
    17 # define BYTE_SWAP
    1813# endif
    19 
    20 # ifdef darwin_x86
    21 # define BYTE_SWAP
    22 # endif
    23 
    24 # ifdef dec
    25 # define BYTE_SWAP
    26 # endif
    27 # endif /* BYTE_SWAP */
    2814
    2915# ifndef NEWLINE

  • trunk/Ohana/src/libfits/matrix/F_add_M.c

    r27435 r28241  
    1313  if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
    1414      (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
    15     fprintf (stderr, "can't add array here: (%lld,%lld) - (%lld,%lld) vs (%lld,%lld)\n",
    16              (long long) x,
    17              (long long) y,
    18              (long long) x + array[0].Naxis[0],
    19              (long long) y + array[0].Naxis[1],
    20              (long long) matrix[0].Naxis[0],
    21              (long long) matrix[0].Naxis[1]);
     15    fprintf (stderr, "can't add array here: ("OFF_T_FMT","OFF_T_FMT") - ("OFF_T_FMT","OFF_T_FMT") vs ("OFF_T_FMT","OFF_T_FMT")\n",
     16              x,
     17              y,
     18              x + array[0].Naxis[0],
     19              y + array[0].Naxis[1],
     20              matrix[0].Naxis[0],
     21              matrix[0].Naxis[1]);
    2222    return;
    2323  }

  • trunk/Ohana/src/libfits/matrix/F_compress_M.c

    r27435 r28241  
    7777    snprintf (zaxis, 10, "ZNAXIS%d", i + 1);
    7878    snprintf (naxis, 10, "NAXIS%d", i + 1);
    79     MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%lld", (long long *) &header->Naxis[i], (long long) header->Naxis[i]);
     79    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  OFF_T_FMT,  &header->Naxis[i], header->Naxis[i]);
    8080  }   
    8181
    … …  
    203203  if (!gfits_varlength_column_define (ftable, &zdef, zcol)) ESCAPE;
    204204  gfits_delete (header, "TFIELDS", 1);
    205   snprintf (key, 10, "TTYPE%lld", (long long) zcol);
     205  snprintf (key, 10, "TTYPE"OFF_T_FMT, zcol);
    206206  gfits_delete (header, key, 1);
    207   snprintf (key, 10, "TFORM%lld", (long long) zcol);
     207  snprintf (key, 10, "TFORM"OFF_T_FMT, zcol);
    208208  gfits_delete (header, key, 1);
    209209

  • trunk/Ohana/src/libfits/matrix/F_insert_M.c

    r27435 r28241  
    1212  if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
    1313      (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
    14     fprintf (stderr, "can't insert array here: (%lld,%lld) - (%lld,%lld) vs (%lld,%lld)\n",
    15              (long long) x,
    16              (long long) y,
    17              (long long) x + array[0].Naxis[0],
    18              (long long) y + array[0].Naxis[1],
    19              (long long) matrix[0].Naxis[0],
    20              (long long) matrix[0].Naxis[1]);
     14    fprintf (stderr, "can't insert array here: ("OFF_T_FMT","OFF_T_FMT") - ("OFF_T_FMT","OFF_T_FMT") vs ("OFF_T_FMT","OFF_T_FMT")\n",
     15              x,
     16              y,
     17              x + array[0].Naxis[0],
     18              y + array[0].Naxis[1],
     19              matrix[0].Naxis[0],
     20              matrix[0].Naxis[1]);
    2121    return;
    2222  }

  • trunk/Ohana/src/libfits/matrix/F_load_M.c

    r27435 r28241  
    9595  }
    9696  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    97     fprintf (stderr, "incomplete block in FITS file: (%lld, %lld)\n", (long long) nbytes, (long long) Nbytes);
     97    fprintf (stderr, "incomplete block in FITS file: ("OFF_T_FMT", "OFF_T_FMT")\n",  nbytes, Nbytes);
    9898    return (TRUE);
    9999  }

  • trunk/Ohana/src/libfits/matrix/F_read_portion.c

    r27435 r28241  
    108108
    109109  if (nbytes < Nbytes - 2880) {  /* this is a bad FITS error: image is not OK */
    110     fprintf (stderr, "error reading in matrix data from FITS file %s (%lld < %lld - 2880)\n", filename, (long long) nbytes, (long long) Nbytes);
     110    fprintf (stderr, "error reading in matrix data from FITS file %s ("OFF_T_FMT" < "OFF_T_FMT" - 2880)\n", filename,  nbytes, Nbytes);
    111111    return (FALSE);
    112112  }
    113113  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    114     fprintf (stderr, "incomplete block in %s: (%lld, %lld)\n", filename, (long long) nbytes, (long long) Nbytes);
     114    fprintf (stderr, "incomplete block in %s: ("OFF_T_FMT", "OFF_T_FMT")\n", filename,  nbytes, Nbytes);
    115115    return (TRUE);
    116116  }

  • trunk/Ohana/src/libfits/matrix/F_read_segment.c

    r27435 r28241  
    148148
    149149  if (nbytes < Nbytes - 2880) {  /* this is a bad FITS error: image is not OK */
    150     fprintf (stderr, "error reading in matrix data from FITS file (%lld < %lld - 2880)\n", (long long) nbytes, (long long) Nbytes);
     150    fprintf (stderr, "error reading in matrix data from FITS file ("OFF_T_FMT" < "OFF_T_FMT" - 2880)\n",  nbytes, Nbytes);
    151151    return (FALSE);
    152152  }
    153153  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    154     fprintf (stderr, "incomplete block in FITS file: (%lld, %lld)\n", (long long) nbytes, (long long) Nbytes);
     154    fprintf (stderr, "incomplete block in FITS file: ("OFF_T_FMT", "OFF_T_FMT")\n",  nbytes, Nbytes);
    155155    return (TRUE);
    156156  }

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

    r27435 r28241  
    2727  for (i = 0; i < header[0].Naxes; i++) {
    2828    sprintf (axis, "NAXIS%d", i + 1);
    29     gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
     29    gfits_modify (header,  axis, OFF_T_FMT, 1, header[0].Naxis[i]);
    3030  }
    3131 

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

    r27435 r28241  
    1313  Nfields = 0;
    1414  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    15   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
     15  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Naxis1);
    1616  Nfields ++;
    1717  Naxis1 += Nbytes*Nval;
    … …  
    3535  /* update TFIELDS & NAXIS1 */
    3636  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    37   gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
     37  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1, Naxis1);
    3838  header[0].Naxis[0] = Naxis1;
    3939
    … …  
    5353  Nfields = 0;
    5454  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    55   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
     55  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Naxis1);
    5656  Nstart = Naxis1 + 1;
    5757  Nfields ++;
    … …  
    7070
    7171  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    72   gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
     72  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1, Naxis1);
    7373  header[0].Naxis[0] = Naxis1;
    7474

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

    r27435 r28241  
    5151 
    5252  /* check existing table dimensions */
    53   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    54   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     53  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     54  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    5555
    5656  /* scan columns to find insert point */
    … …  
    187187 
    188188  /* check existing table dimensions */
    189   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    190   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     189  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     190  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    191191
    192192  /* scan columns to find insert point */
    … …  
    336336 
    337337  /* check existing table dimensions */
    338   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    339   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     338  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     339  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    340340
    341341  /* scan columns to find insert point */

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

    r27435 r28241  
    6464    perror (string);
    6565    if (Nread < gfits_data_min_size (table[0].header)) {
    66       fprintf (stderr, "error: fits read error in %s, read %lld, need %lld\n", __func__, (long long) Nread, (long long) gfits_data_min_size (table[0].header));
     66      fprintf (stderr, "error: fits read error in %s, read "OFF_T_FMT", need "OFF_T_FMT"\n", __func__,  Nread, gfits_data_min_size (table[0].header));
    6767      gfits_free_table  (table);
    6868      return (FALSE);
    … …  
    109109  /* modify structure and header to match actual read rows Ny */
    110110  table[0].header[0].Naxis[1] = Nrows;
    111   gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, (long long) Nrows);
     111  gfits_modify (table[0].header, "NAXIS2",  OFF_T_FMT, 1, Nrows);
    112112  table[0].datasize = gfits_data_size (table[0].header);
    113113
    … …  
    185185    /* file pointer is at beginning of desired table data */
    186186    start = ftello (f);
    187     gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    188     gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     187
     188    gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     189    gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
     190
    189191    for (i = 0; i < Nrow; i++) {
    190192      if (row[i] > Ny) { return (FALSE); }

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

    r27435 r28241  
    7070  if (!status) return (FALSE);
    7171                                                           
    72   gfits_scan (Theader,  "NAXIS1", "%lld", 1, (long long *) &Theader[0].Naxis[0]);
    73   gfits_scan (Theader,  "NAXIS2", "%lld", 1, (long long *) &Theader[0].Naxis[1]);
    74   gfits_scan (Theader,  "NAXIS3", "%lld", 1, (long long *) &Theader[0].Naxis[2]);
    75   gfits_scan (Theader,  "NAXIS4", "%lld", 1, (long long *) &Theader[0].Naxis[3]);
    76   gfits_scan (Theader,  "NAXIS5", "%lld", 1, (long long *) &Theader[0].Naxis[4]);
    77   gfits_scan (Theader,  "NAXIS6", "%lld", 1, (long long *) &Theader[0].Naxis[5]);
    78   gfits_scan (Theader,  "NAXIS7", "%lld", 1, (long long *) &Theader[0].Naxis[6]);
    79   gfits_scan (Theader,  "NAXIS8", "%lld", 1, (long long *) &Theader[0].Naxis[7]);
    80   gfits_scan (Theader,  "NAXIS9", "%lld", 1, (long long *) &Theader[0].Naxis[8]);
    81   gfits_scan (Theader, "NAXIS10", "%lld", 1, (long long *) &Theader[0].Naxis[9]);
     72  gfits_scan (Theader,  "NAXIS1", OFF_T_FMT, 1, &Theader[0].Naxis[0]);
     73  gfits_scan (Theader,  "NAXIS2", OFF_T_FMT, 1, &Theader[0].Naxis[1]);
     74  gfits_scan (Theader,  "NAXIS3", OFF_T_FMT, 1, &Theader[0].Naxis[2]);
     75  gfits_scan (Theader,  "NAXIS4", OFF_T_FMT, 1, &Theader[0].Naxis[3]);
     76  gfits_scan (Theader,  "NAXIS5", OFF_T_FMT, 1, &Theader[0].Naxis[4]);
     77  gfits_scan (Theader,  "NAXIS6", OFF_T_FMT, 1, &Theader[0].Naxis[5]);
     78  gfits_scan (Theader,  "NAXIS7", OFF_T_FMT, 1, &Theader[0].Naxis[6]);
     79  gfits_scan (Theader,  "NAXIS8", OFF_T_FMT, 1, &Theader[0].Naxis[7]);
     80  gfits_scan (Theader,  "NAXIS9", OFF_T_FMT, 1, &Theader[0].Naxis[8]);
     81  gfits_scan (Theader, "NAXIS10", OFF_T_FMT, 1, &Theader[0].Naxis[9]);
    8282
    8383  return (TRUE);

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

    r27435 r28241  
    4949 
    5050  /* check existing table dimensions */
    51   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    52   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     51  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     52  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    5353  if (Ny == 0) {
    5454    Ny = Nrow;
    5555    header[0].Naxis[1] = Ny;
    56     gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     56    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    5757
    5858    nbytes = gfits_data_size (header);
    … …  
    181181 
    182182  /* check existing table dimensions */
    183   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    184   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     183  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     184  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    185185  if (Ny == 0) {
    186186    Ny = Nrow;
    187187    header[0].Naxis[1] = Ny;
    188     gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     188    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    189189
    190190    nbytes = gfits_data_size (header);

  • 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

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

    r27435 r28241  
    1111  header = table[0].header;
    1212
    13   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    14   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     13  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     14  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    1515 
    1616  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    2323  Ny += Nrow;
    2424  header[0].Naxis[1] = Ny;
    25   gfits_modify (header, "NAXIS2",  "%lld", 1, (long long) Ny);
     25  gfits_modify (header, "NAXIS2",  OFF_T_FMT, 1, Ny);
    2626
    2727  nbytes = gfits_data_size (header);
    … …  
    4343  header = table[0].header;
    4444
    45   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    46   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     45  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     46  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    4747 
    4848  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    6464  Ny += Nrow;
    6565  header[0].Naxis[1] = Ny;
    66   gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     66  gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    6767
    6868  table[0].datasize = gfits_data_size (table[0].header);
    … …  
    8181  header = table[0].header;
    8282
    83   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    84   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     83  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     84  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    8585 
    8686  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    9797  Ny -= Nrow;
    9898  header[0].Naxis[1] = Ny;
    99   gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     99  gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    100100
    101101  nbytes = gfits_data_size (header);

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

    r27473 r28241  
    6464
    6565  // heap_start must be long long so file may be very large
    66   if (!gfits_scan (ftable->header, "THEAP", "%lld", 1, (long long *) &def->heap_start)) {
     66  if (!gfits_scan (ftable->header, "THEAP", OFF_T_FMT, 1, &def->heap_start)) {
    6767    def->heap_start = ftable->header->Naxis[0]*ftable->header->Naxis[1];
    6868  }

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

    r27435 r28241  
    4040  Nrow = table[0].Nrow;
    4141  row = table[0].row;
    42   gfits_scan (table[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    43   gfits_scan (table[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     42  gfits_scan (table[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     43  gfits_scan (table[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    4444
    4545  /* file pointer is at beginning of desired table data */
    … …  
    7979 
    8080  /* modify vtable to represent full disk table */
    81   gfits_modify (ftable[0].header, "NAXIS2", "%lld", 1, (long long) Ntotal);
     81  gfits_modify (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, Ntotal);
    8282  ftable[0].header[0].Naxis[1] = Ntotal;
    8383
Note: See TracChangeset for help on using the changeset viewer.