summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/imageutl.h
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2023-09-17 09:41:35 -0400
committer AJR <ajrhacker@users.noreply.github.com>2023-09-17 09:43:06 -0400
commit676e44ca955121808828ddc7a8a024dc721f682c (patch)
tree64ca682d6e9dc0a752339f39f1900cc3b3c50fdb /src/lib/formats/imageutl.h
parent2f7b1f05c72e568032930e7ceba2db0b4cb63e1a (diff)
imageutl.h: Retire pick_integer_[bl]e and place_integer_[bl]e in favor of the simpler functions in multibyte.h
* multibyte.h: Add constexpr for getters and noexcept for all functions
Diffstat (limited to 'src/lib/formats/imageutl.h')
-rw-r--r--src/lib/formats/imageutl.h140
1 files changed, 0 insertions, 140 deletions
diff --git a/src/lib/formats/imageutl.h b/src/lib/formats/imageutl.h
index 09213dc20af..53b7170fc65 100644
--- a/src/lib/formats/imageutl.h
+++ b/src/lib/formats/imageutl.h
@@ -25,146 +25,6 @@ unsigned short ccitt_crc16(unsigned short crc, const unsigned char *buffer, size
unsigned short ccitt_crc16_one( unsigned short crc, const unsigned char data );
/* -----------------------------------------------------------------------
- * Alignment-friendly integer placement
- * ----------------------------------------------------------------------- */
-
-inline void place_integer_be(void *ptr, size_t offset, size_t size, uint64_t value)
-{
- uint8_t *byte_ptr = ((uint8_t *) ptr) + offset;
- uint16_t val16;
- uint32_t val32;
-
- switch (size)
- {
- case 2:
- val16 = big_endianize_int16((uint16_t) value);
- memcpy(byte_ptr, &val16, sizeof(val16));
- break;
-
- case 4:
- val32 = big_endianize_int32((uint32_t) value);
- memcpy(byte_ptr, &val32, sizeof(val32));
- break;
-
- default:
- 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;
- }
-}
-
-inline uint64_t pick_integer_be(const void *ptr, size_t offset, size_t size)
-{
- uint64_t result = 0;
- const uint8_t *byte_ptr = ((const uint8_t *) ptr) + offset;
- uint16_t val16;
- uint32_t val32;
-
- switch (size)
- {
- case 1:
- result = *byte_ptr;
- break;
-
- case 2:
- memcpy(&val16, byte_ptr, sizeof(val16));
- result = big_endianize_int16(val16);
- break;
-
- case 4:
- memcpy(&val32, byte_ptr, sizeof(val32));
- result = big_endianize_int32(val32);
- break;
-
- default:
- 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;
-}
-
-inline void place_integer_le(void *ptr, size_t offset, size_t size, uint64_t value)
-{
- uint8_t *byte_ptr = ((uint8_t *) ptr) + offset;
- uint16_t val16;
- uint32_t val32;
-
- switch (size)
- {
- case 2:
- val16 = little_endianize_int16((uint16_t) value);
- memcpy(byte_ptr, &val16, sizeof(val16));
- break;
-
- case 4:
- val32 = little_endianize_int32((uint32_t) value);
- memcpy(byte_ptr, &val32, sizeof(val32));
- break;
-
- default:
- 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_t pick_integer_le(const void *ptr, size_t offset, size_t size)
-{
- uint64_t result = 0;
- const uint8_t *byte_ptr = ((const uint8_t *) ptr) + offset;
- uint16_t val16;
- uint32_t val32;
-
- switch (size)
- {
- case 1:
- result = *byte_ptr;
- break;
-
- case 2:
- memcpy(&val16, byte_ptr, sizeof(val16));
- result = little_endianize_int16(val16);
- break;
-
- case 4:
- memcpy(&val32, byte_ptr, sizeof(val32));
- result = little_endianize_int32(val32);
- break;
-
- default:
- 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;
-}
-
-/* -----------------------------------------------------------------------
* Miscellaneous
* ----------------------------------------------------------------------- */