diff options
Diffstat (limited to 'src/lib/formats/imageutl.h')
-rw-r--r-- | src/lib/formats/imageutl.h | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/lib/formats/imageutl.h b/src/lib/formats/imageutl.h index 7da4a184112..5e478cfb1e7 100644 --- a/src/lib/formats/imageutl.h +++ b/src/lib/formats/imageutl.h @@ -25,43 +25,43 @@ unsigned short ccitt_crc16_one( unsigned short crc, const unsigned char data ); * Alignment-friendly integer placement * ----------------------------------------------------------------------- */ -static inline void place_integer_be(void *ptr, size_t offset, size_t size, UINT64 value) +static inline void place_integer_be(void *ptr, size_t offset, size_t size, uint64_t value) { - UINT8 *byte_ptr = ((UINT8 *) ptr) + offset; - UINT16 val16; - UINT32 val32; + uint8_t *byte_ptr = ((uint8_t *) ptr) + offset; + uint16_t val16; + uint32_t val32; switch(size) { case 2: - val16 = big_endianize_int16((UINT16) value); + val16 = big_endianize_int16((uint16_t) value); memcpy(byte_ptr, &val16, sizeof(val16)); break; case 4: - val32 = big_endianize_int32((UINT32) value); + val32 = big_endianize_int32((uint32_t) value); memcpy(byte_ptr, &val32, sizeof(val32)); break; default: - if (size >= 1) byte_ptr[0] = (UINT8) (value >> ((size - 1) * 8)); - if (size >= 2) byte_ptr[1] = (UINT8) (value >> ((size - 2) * 8)); - if (size >= 3) byte_ptr[2] = (UINT8) (value >> ((size - 3) * 8)); - if (size >= 4) byte_ptr[3] = (UINT8) (value >> ((size - 4) * 8)); - if (size >= 5) byte_ptr[4] = (UINT8) (value >> ((size - 5) * 8)); - if (size >= 6) byte_ptr[5] = (UINT8) (value >> ((size - 6) * 8)); - if (size >= 7) byte_ptr[6] = (UINT8) (value >> ((size - 7) * 8)); - if (size >= 8) byte_ptr[7] = (UINT8) (value >> ((size - 8) * 8)); + if (size >= 1) byte_ptr[0] = (uint8_t) (value >> ((size - 1) * 8)); + if (size >= 2) byte_ptr[1] = (uint8_t) (value >> ((size - 2) * 8)); + if (size >= 3) byte_ptr[2] = (uint8_t) (value >> ((size - 3) * 8)); + if (size >= 4) byte_ptr[3] = (uint8_t) (value >> ((size - 4) * 8)); + if (size >= 5) byte_ptr[4] = (uint8_t) (value >> ((size - 5) * 8)); + if (size >= 6) byte_ptr[5] = (uint8_t) (value >> ((size - 6) * 8)); + if (size >= 7) byte_ptr[6] = (uint8_t) (value >> ((size - 7) * 8)); + if (size >= 8) byte_ptr[7] = (uint8_t) (value >> ((size - 8) * 8)); break; } } -static inline UINT64 pick_integer_be(const void *ptr, size_t offset, size_t size) +static inline uint64_t pick_integer_be(const void *ptr, size_t offset, size_t size) { - UINT64 result = 0; - const UINT8 *byte_ptr = ((const UINT8 *) ptr) + offset; - UINT16 val16; - UINT32 val32; + uint64_t result = 0; + const uint8_t *byte_ptr = ((const uint8_t *) ptr) + offset; + uint16_t val16; + uint32_t val32; switch(size) { @@ -80,56 +80,56 @@ static inline UINT64 pick_integer_be(const void *ptr, size_t offset, size_t size break; default: - if (size >= 1) result |= ((UINT64) byte_ptr[0]) << ((size - 1) * 8); - if (size >= 2) result |= ((UINT64) byte_ptr[1]) << ((size - 2) * 8); - if (size >= 3) result |= ((UINT64) byte_ptr[2]) << ((size - 3) * 8); - if (size >= 4) result |= ((UINT64) byte_ptr[3]) << ((size - 4) * 8); - if (size >= 5) result |= ((UINT64) byte_ptr[4]) << ((size - 5) * 8); - if (size >= 6) result |= ((UINT64) byte_ptr[5]) << ((size - 6) * 8); - if (size >= 7) result |= ((UINT64) byte_ptr[6]) << ((size - 7) * 8); - if (size >= 8) result |= ((UINT64) byte_ptr[7]) << ((size - 8) * 8); + if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << ((size - 1) * 8); + if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << ((size - 2) * 8); + if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << ((size - 3) * 8); + if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << ((size - 4) * 8); + if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << ((size - 5) * 8); + if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << ((size - 6) * 8); + if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << ((size - 7) * 8); + if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << ((size - 8) * 8); break; } return result; } -static inline void place_integer_le(void *ptr, size_t offset, size_t size, UINT64 value) +static inline void place_integer_le(void *ptr, size_t offset, size_t size, uint64_t value) { - UINT8 *byte_ptr = ((UINT8 *) ptr) + offset; - UINT16 val16; - UINT32 val32; + uint8_t *byte_ptr = ((uint8_t *) ptr) + offset; + uint16_t val16; + uint32_t val32; switch(size) { case 2: - val16 = little_endianize_int16((UINT16) value); + val16 = little_endianize_int16((uint16_t) value); memcpy(byte_ptr, &val16, sizeof(val16)); break; case 4: - val32 = little_endianize_int32((UINT32) value); + val32 = little_endianize_int32((uint32_t) value); memcpy(byte_ptr, &val32, sizeof(val32)); break; default: - if (size >= 1) byte_ptr[0] = (UINT8) (value >> (0 * 8)); - if (size >= 2) byte_ptr[1] = (UINT8) (value >> (1 * 8)); - if (size >= 3) byte_ptr[2] = (UINT8) (value >> (2 * 8)); - if (size >= 4) byte_ptr[3] = (UINT8) (value >> (3 * 8)); - if (size >= 5) byte_ptr[4] = (UINT8) (value >> (4 * 8)); - if (size >= 6) byte_ptr[5] = (UINT8) (value >> (5 * 8)); - if (size >= 7) byte_ptr[6] = (UINT8) (value >> (6 * 8)); - if (size >= 8) byte_ptr[7] = (UINT8) (value >> (7 * 8)); + if (size >= 1) byte_ptr[0] = (uint8_t) (value >> (0 * 8)); + if (size >= 2) byte_ptr[1] = (uint8_t) (value >> (1 * 8)); + if (size >= 3) byte_ptr[2] = (uint8_t) (value >> (2 * 8)); + if (size >= 4) byte_ptr[3] = (uint8_t) (value >> (3 * 8)); + if (size >= 5) byte_ptr[4] = (uint8_t) (value >> (4 * 8)); + if (size >= 6) byte_ptr[5] = (uint8_t) (value >> (5 * 8)); + if (size >= 7) byte_ptr[6] = (uint8_t) (value >> (6 * 8)); + if (size >= 8) byte_ptr[7] = (uint8_t) (value >> (7 * 8)); break; } } -static inline UINT64 pick_integer_le(const void *ptr, size_t offset, size_t size) +static inline uint64_t pick_integer_le(const void *ptr, size_t offset, size_t size) { - UINT64 result = 0; - const UINT8 *byte_ptr = ((const UINT8 *) ptr) + offset; - UINT16 val16; - UINT32 val32; + uint64_t result = 0; + const uint8_t *byte_ptr = ((const uint8_t *) ptr) + offset; + uint16_t val16; + uint32_t val32; switch(size) { @@ -148,14 +148,14 @@ static inline UINT64 pick_integer_le(const void *ptr, size_t offset, size_t size break; default: - if (size >= 1) result |= ((UINT64) byte_ptr[0]) << (0 * 8); - if (size >= 2) result |= ((UINT64) byte_ptr[1]) << (1 * 8); - if (size >= 3) result |= ((UINT64) byte_ptr[2]) << (2 * 8); - if (size >= 4) result |= ((UINT64) byte_ptr[3]) << (3 * 8); - if (size >= 5) result |= ((UINT64) byte_ptr[4]) << (4 * 8); - if (size >= 6) result |= ((UINT64) byte_ptr[5]) << (5 * 8); - if (size >= 7) result |= ((UINT64) byte_ptr[6]) << (6 * 8); - if (size >= 8) result |= ((UINT64) byte_ptr[7]) << (7 * 8); + if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << (0 * 8); + if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << (1 * 8); + if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << (2 * 8); + if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << (3 * 8); + if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << (4 * 8); + if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << (5 * 8); + if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << (6 * 8); + if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << (7 * 8); break; } return result; |