OpenSystemsDevelopment / qpdf

Commit 17d431dfd5c695eec5f8ff6e023b847b46d9d521

Authored by Jay Berkenbilt
1 parent 6d81f014

Fix integer type warnings for big-endian systems

Inline Side-by-side
Showing 1 changed file with 56 additions and 56 deletions
libqpdf/sph/sph_types.h
  View file @17d431d
... ... @@ -1384,17 +1384,17 @@ sph_enc32be(void *dst, sph_u32 val)
1384 1384 #endif
1385 1385 *(sph_u32 *)dst = val;
1386 1386 } else {
1387   - ((unsigned char *)dst)[0] = (val >> 24);
1388   - ((unsigned char *)dst)[1] = (val >> 16);
1389   - ((unsigned char *)dst)[2] = (val >> 8);
1390   - ((unsigned char *)dst)[3] = val;
  1387 + ((unsigned char *)dst)[0] = (unsigned char)(val >> 24);
  1388 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 16);
  1389 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 8);
  1390 + ((unsigned char *)dst)[3] = (unsigned char)(val);
1391 1391 }
1392 1392 #endif
1393 1393 #else
1394   - ((unsigned char *)dst)[0] = (val >> 24);
1395   - ((unsigned char *)dst)[1] = (val >> 16);
1396   - ((unsigned char *)dst)[2] = (val >> 8);
1397   - ((unsigned char *)dst)[3] = val;
  1394 + ((unsigned char *)dst)[0] = (unsigned char)(val >> 24);
  1395 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 16);
  1396 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 8);
  1397 + ((unsigned char *)dst)[3] = (unsigned char)(val);
1398 1398 #endif
1399 1399 }
1400 1400  
... ... @@ -1413,10 +1413,10 @@ sph_enc32be_aligned(void *dst, sph_u32 val)
1413 1413 #elif SPH_BIG_ENDIAN
1414 1414 *(sph_u32 *)dst = val;
1415 1415 #else
1416   - ((unsigned char *)dst)[0] = (val >> 24);
1417   - ((unsigned char *)dst)[1] = (val >> 16);
1418   - ((unsigned char *)dst)[2] = (val >> 8);
1419   - ((unsigned char *)dst)[3] = val;
  1416 + ((unsigned char *)dst)[0] = (unsigned char)(val >> 24);
  1417 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 16);
  1418 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 8);
  1419 + ((unsigned char *)dst)[3] = (unsigned char)(val);
1420 1420 #endif
1421 1421 }
1422 1422  
... ... @@ -1502,17 +1502,17 @@ sph_enc32le(void *dst, sph_u32 val)
1502 1502 #endif
1503 1503 *(sph_u32 *)dst = val;
1504 1504 } else {
1505   - ((unsigned char *)dst)[0] = val;
1506   - ((unsigned char *)dst)[1] = (val >> 8);
1507   - ((unsigned char *)dst)[2] = (val >> 16);
1508   - ((unsigned char *)dst)[3] = (val >> 24);
  1505 + ((unsigned char *)dst)[0] = (unsigned char)(val);
  1506 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 8);
  1507 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 16);
  1508 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 24);
1509 1509 }
1510 1510 #endif
1511 1511 #else
1512   - ((unsigned char *)dst)[0] = val;
1513   - ((unsigned char *)dst)[1] = (val >> 8);
1514   - ((unsigned char *)dst)[2] = (val >> 16);
1515   - ((unsigned char *)dst)[3] = (val >> 24);
  1512 + ((unsigned char *)dst)[0] = (unsigned char)(val);
  1513 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 8);
  1514 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 16);
  1515 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 24);
1516 1516 #endif
1517 1517 }
1518 1518  
... ... @@ -1531,10 +1531,10 @@ sph_enc32le_aligned(void *dst, sph_u32 val)
1531 1531 #elif SPH_BIG_ENDIAN
1532 1532 *(sph_u32 *)dst = sph_bswap32(val);
1533 1533 #else
1534   - ((unsigned char *)dst)[0] = val;
1535   - ((unsigned char *)dst)[1] = (val >> 8);
1536   - ((unsigned char *)dst)[2] = (val >> 16);
1537   - ((unsigned char *)dst)[3] = (val >> 24);
  1534 + ((unsigned char *)dst)[0] = (unsigned char)(val);
  1535 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 8);
  1536 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 16);
  1537 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 24);
1538 1538 #endif
1539 1539 }
1540 1540  
... ... @@ -1682,14 +1682,14 @@ sph_enc64be(void *dst, sph_u64 val)
1682 1682 }
1683 1683 #endif
1684 1684 #else
1685   - ((unsigned char *)dst)[0] = (val >> 56);
1686   - ((unsigned char *)dst)[1] = (val >> 48);
1687   - ((unsigned char *)dst)[2] = (val >> 40);
1688   - ((unsigned char *)dst)[3] = (val >> 32);
1689   - ((unsigned char *)dst)[4] = (val >> 24);
1690   - ((unsigned char *)dst)[5] = (val >> 16);
1691   - ((unsigned char *)dst)[6] = (val >> 8);
1692   - ((unsigned char *)dst)[7] = val;
  1685 + ((unsigned char *)dst)[0] = (unsigned char)(val >> 56);
  1686 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 48);
  1687 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 40);
  1688 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 32);
  1689 + ((unsigned char *)dst)[4] = (unsigned char)(val >> 24);
  1690 + ((unsigned char *)dst)[5] = (unsigned char)(val >> 16);
  1691 + ((unsigned char *)dst)[6] = (unsigned char)(val >> 8);
  1692 + ((unsigned char *)dst)[7] = (unsigned char)(val);
1693 1693 #endif
1694 1694 }
1695 1695  
... ... @@ -1708,14 +1708,14 @@ sph_enc64be_aligned(void *dst, sph_u64 val)
1708 1708 #elif SPH_BIG_ENDIAN
1709 1709 *(sph_u64 *)dst = val;
1710 1710 #else
1711   - ((unsigned char *)dst)[0] = (val >> 56);
1712   - ((unsigned char *)dst)[1] = (val >> 48);
1713   - ((unsigned char *)dst)[2] = (val >> 40);
1714   - ((unsigned char *)dst)[3] = (val >> 32);
1715   - ((unsigned char *)dst)[4] = (val >> 24);
1716   - ((unsigned char *)dst)[5] = (val >> 16);
1717   - ((unsigned char *)dst)[6] = (val >> 8);
1718   - ((unsigned char *)dst)[7] = val;
  1711 + ((unsigned char *)dst)[0] = (unsigned char)(val >> 56);
  1712 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 48);
  1713 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 40);
  1714 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 32);
  1715 + ((unsigned char *)dst)[4] = (unsigned char)(val >> 24);
  1716 + ((unsigned char *)dst)[5] = (unsigned char)(val >> 16);
  1717 + ((unsigned char *)dst)[6] = (unsigned char)(val >> 8);
  1718 + ((unsigned char *)dst)[7] = (unsigned char)(val);
1719 1719 #endif
1720 1720 }
1721 1721  
... ... @@ -1824,14 +1824,14 @@ sph_enc64le(void *dst, sph_u64 val)
1824 1824 }
1825 1825 #endif
1826 1826 #else
1827   - ((unsigned char *)dst)[0] = val;
1828   - ((unsigned char *)dst)[1] = (val >> 8);
1829   - ((unsigned char *)dst)[2] = (val >> 16);
1830   - ((unsigned char *)dst)[3] = (val >> 24);
1831   - ((unsigned char *)dst)[4] = (val >> 32);
1832   - ((unsigned char *)dst)[5] = (val >> 40);
1833   - ((unsigned char *)dst)[6] = (val >> 48);
1834   - ((unsigned char *)dst)[7] = (val >> 56);
  1827 + ((unsigned char *)dst)[0] = (unsigned char)(val);
  1828 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 8);
  1829 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 16);
  1830 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 24);
  1831 + ((unsigned char *)dst)[4] = (unsigned char)(val >> 32);
  1832 + ((unsigned char *)dst)[5] = (unsigned char)(val >> 40);
  1833 + ((unsigned char *)dst)[6] = (unsigned char)(val >> 48);
  1834 + ((unsigned char *)dst)[7] = (unsigned char)(val >> 56);
1835 1835 #endif
1836 1836 }
1837 1837  
... ... @@ -1850,14 +1850,14 @@ sph_enc64le_aligned(void *dst, sph_u64 val)
1850 1850 #elif SPH_BIG_ENDIAN
1851 1851 *(sph_u64 *)dst = sph_bswap64(val);
1852 1852 #else
1853   - ((unsigned char *)dst)[0] = val;
1854   - ((unsigned char *)dst)[1] = (val >> 8);
1855   - ((unsigned char *)dst)[2] = (val >> 16);
1856   - ((unsigned char *)dst)[3] = (val >> 24);
1857   - ((unsigned char *)dst)[4] = (val >> 32);
1858   - ((unsigned char *)dst)[5] = (val >> 40);
1859   - ((unsigned char *)dst)[6] = (val >> 48);
1860   - ((unsigned char *)dst)[7] = (val >> 56);
  1853 + ((unsigned char *)dst)[0] = (unsigned char)(val);
  1854 + ((unsigned char *)dst)[1] = (unsigned char)(val >> 8);
  1855 + ((unsigned char *)dst)[2] = (unsigned char)(val >> 16);
  1856 + ((unsigned char *)dst)[3] = (unsigned char)(val >> 24);
  1857 + ((unsigned char *)dst)[4] = (unsigned char)(val >> 32);
  1858 + ((unsigned char *)dst)[5] = (unsigned char)(val >> 40);
  1859 + ((unsigned char *)dst)[6] = (unsigned char)(val >> 48);
  1860 + ((unsigned char *)dst)[7] = (unsigned char)(val >> 56);
1861 1861 #endif
1862 1862 }
1863 1863  
... ...