fix -Wsign-conversion warnings
This commit is contained in:
parent
eb1c976bc9
commit
d9bc3dbb81
1 changed files with 1 additions and 1 deletions
|
@ -120,7 +120,7 @@ inline void read_double_ndr(const char* data, double & val)
|
||||||
inline void read_int16_xdr(const char* data, boost::int16_t & val)
|
inline void read_int16_xdr(const char* data, boost::int16_t & val)
|
||||||
{
|
{
|
||||||
#ifndef MAPNIK_BIG_ENDIAN
|
#ifndef MAPNIK_BIG_ENDIAN
|
||||||
val = (data[3]&0xff) | ((data[2]&0xff)<<8);
|
val = static_cast<boost::int16_t>((data[3]&0xff) | ((data[2]&0xff)<<8));
|
||||||
#else
|
#else
|
||||||
std::memcpy(&val,data,2);
|
std::memcpy(&val,data,2);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue