IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 6, 2015, 10:04:55 AM (11 years ago)
Author:
eugene
Message:

fix AUTO types to match funpack needs; swap double correctly

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20150429/src/libfits/table/F_set_column.c

    r38404 r38408  
    266266  SET_VALUES("int",         int, "char", char, SWAP_WORD, 1);
    267267  SET_VALUES("int64_t", int64_t, "char", char, SWAP_DBLE, 1);
     268  SET_VALUES("float",     float, "char", char, SWAP_WORD, 1);
    268269  SET_VALUES("double",   double, "char", char, SWAP_DBLE, 1);
    269   SET_VALUES("float",     float, "char", char, SWAP_WORD, 1);
    270270
    271271  SET_VALUES("char",       char, "byte", char, SWAP_NONE, 1);
    … …  
    274274  SET_VALUES("int",         int, "byte", char, SWAP_WORD, 1);
    275275  SET_VALUES("int64_t", int64_t, "byte", char, SWAP_DBLE, 1);
    276   SET_VALUES("float",     float, "byte", char, SWAP_DBLE, 1);
    277   SET_VALUES("double",   double, "byte", char, SWAP_WORD, 1);
     276  SET_VALUES("float",     float, "byte", char, SWAP_WORD, 1);
     277  SET_VALUES("double",   double, "byte", char, SWAP_DBLE, 1);
    278278
    279279  SET_VALUES("char",       char, "short", short, SWAP_NONE, 2);
    … …  
    282282  SET_VALUES("int",         int, "short", short, SWAP_WORD, 2);
    283283  SET_VALUES("int64_t", int64_t, "short", short, SWAP_DBLE, 2);
    284   SET_VALUES("float",     float, "short", short, SWAP_DBLE, 2);
    285   SET_VALUES("double",   double, "short", short, SWAP_WORD, 2);
     284  SET_VALUES("float",     float, "short", short, SWAP_WORD, 2);
     285  SET_VALUES("double",   double, "short", short, SWAP_DBLE, 2);
    286286
    287287  SET_VALUES("char",       char, "int", int, SWAP_NONE, 4);
    … …  
    290290  SET_VALUES("int",         int, "int", int, SWAP_WORD, 4);
    291291  SET_VALUES("int64_t", int64_t, "int", int, SWAP_DBLE, 4);
    292   SET_VALUES("float",     float, "int", int, SWAP_DBLE, 4);
    293   SET_VALUES("double",   double, "int", int, SWAP_WORD, 4);
     292  SET_VALUES("float",     float, "int", int, SWAP_WORD, 4);
     293  SET_VALUES("double",   double, "int", int, SWAP_DBLE, 4);
    294294
    295295  SET_VALUES("char",       char, "int64_t", int64_t, SWAP_NONE, 8);
    … …  
    298298  SET_VALUES("int",         int, "int64_t", int64_t, SWAP_WORD, 8);
    299299  SET_VALUES("int64_t", int64_t, "int64_t", int64_t, SWAP_DBLE, 8);
    300   SET_VALUES("float",     float, "int64_t", int64_t, SWAP_DBLE, 8);
    301   SET_VALUES("double",   double, "int64_t", int64_t, SWAP_WORD, 8);
     300  SET_VALUES("float",     float, "int64_t", int64_t, SWAP_WORD, 8);
     301  SET_VALUES("double",   double, "int64_t", int64_t, SWAP_DBLE, 8);
    302302
    303303  SET_VALUES("char",       char, "float", float, SWAP_NONE, 4);
    … …  
    306306  SET_VALUES("int",         int, "float", float, SWAP_WORD, 4);
    307307  SET_VALUES("int64_t", int64_t, "float", float, SWAP_DBLE, 4);
    308   SET_VALUES("float",     float, "float", float, SWAP_DBLE, 4);
    309   SET_VALUES("double",   double, "float", float, SWAP_WORD, 4);
     308  SET_VALUES("float",     float, "float", float, SWAP_WORD, 4);
     309  SET_VALUES("double",   double, "float", float, SWAP_DBLE, 4);
    310310
    311311  SET_VALUES("char",       char, "double", double, SWAP_NONE, 8);
    … …  
    314314  SET_VALUES("int",         int, "double", double, SWAP_WORD, 8);
    315315  SET_VALUES("int64_t", int64_t, "double", double, SWAP_DBLE, 8);
    316   SET_VALUES("float",     float, "double", double, SWAP_DBLE, 8);
    317   SET_VALUES("double",   double, "double", double, SWAP_WORD, 8);
     316  SET_VALUES("float",     float, "double", double, SWAP_WORD, 8);
     317  SET_VALUES("double",   double, "double", double, SWAP_DBLE, 8);
    318318
    319319# if (0)
Note: See TracChangeset for help on using the changeset viewer.