Changeset 18049 for trunk/Mars


Ignore:
Timestamp:
01/03/15 16:43:25 (10 years ago)
Author:
tbretz
Message:
 
Location:
trunk/Mars/mcore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mcore/FITS.h

    r17776 r18049  
    119119
    120120      TileHeader(uint32_t nRows,
    121                  uint64_t s) : id({'T', 'I', 'L', 'E'}),
     121                 uint64_t s) : id{'T', 'I', 'L', 'E'},
    122122                                 numRows(nRows),
    123123                                 size(s)

  • trunk/Mars/mcore/checksum.h

    r17282 r18049  
    165165            const uint8_t remainder = byte % 4;
    166166
    167             uint32_t ch[4] = { quotient+remainder, quotient, quotient, quotient };
     167            uint32_t ch[4] = { uint32_t(quotient+remainder), quotient, quotient, quotient };
    168168
    169169            // avoid ASCII  punctuation

  • trunk/Mars/mcore/fits.h

    r17911 r18049  
    331331                }
    332332
    333                 const Table::Column col = { bytes, n, size, n*size, type, unit, compress};
     333                const Table::Column col = { bytes, size_t(n), size, n*size, type, unit, compress};
    334334
    335335                cols[id] = col;
Note: See TracChangeset for help on using the changeset viewer.