From 1748d1e662c9618cc16f80d5e67669e9e9d6d4be Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 12 Jan 2024 03:01:12 +0000 Subject: CTAN sync 202401120301 --- dviware/dvisvgm/libs/woff2/src/store_bytes.h | 16 ---------------- dviware/dvisvgm/libs/woff2/src/woff2_common.cc | 12 ++---------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'dviware/dvisvgm/libs/woff2') diff --git a/dviware/dvisvgm/libs/woff2/src/store_bytes.h b/dviware/dvisvgm/libs/woff2/src/store_bytes.h index fff3c62f84..099c0f217a 100644 --- a/dviware/dvisvgm/libs/woff2/src/store_bytes.h +++ b/dviware/dvisvgm/libs/woff2/src/store_bytes.h @@ -27,15 +27,8 @@ inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) { } inline size_t Store16(uint8_t* dst, size_t offset, int x) { -#if defined(WOFF_LITTLE_ENDIAN) - *reinterpret_cast(dst + offset) = - ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); -#elif defined(WOFF_BIG_ENDIAN) - *reinterpret_cast(dst + offset) = static_cast(x); -#else dst[offset] = x >> 8; dst[offset + 1] = x; -#endif return offset + 2; } @@ -47,17 +40,8 @@ inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) { } inline void Store16(int val, size_t* offset, uint8_t* dst) { -#if defined(WOFF_LITTLE_ENDIAN) - *reinterpret_cast(dst + *offset) = - ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); - *offset += 2; -#elif defined(WOFF_BIG_ENDIAN) - *reinterpret_cast(dst + *offset) = static_cast(val); - *offset += 2; -#else dst[(*offset)++] = val >> 8; dst[(*offset)++] = val; -#endif } inline void StoreBytes(const uint8_t* data, size_t len, diff --git a/dviware/dvisvgm/libs/woff2/src/woff2_common.cc b/dviware/dvisvgm/libs/woff2/src/woff2_common.cc index fe0a3beda7..a24d2131b7 100644 --- a/dviware/dvisvgm/libs/woff2/src/woff2_common.cc +++ b/dviware/dvisvgm/libs/woff2/src/woff2_common.cc @@ -19,16 +19,8 @@ uint32_t ComputeULongSum(const uint8_t* buf, size_t size) { uint32_t checksum = 0; size_t aligned_size = size & ~3; for (size_t i = 0; i < aligned_size; i += 4) { -#if defined(WOFF_LITTLE_ENDIAN) - uint32_t v = *reinterpret_cast(buf + i); - checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | - ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24)); -#elif defined(WOFF_BIG_ENDIAN) - checksum += *reinterpret_cast(buf + i); -#else - checksum += (buf[i] << 24) | (buf[i + 1] << 16) | - (buf[i + 2] << 8) | buf[i + 3]; -#endif + checksum += + (buf[i] << 24) | (buf[i + 1] << 16) | (buf[i + 2] << 8) | buf[i + 3]; } // treat size not aligned on 4 as if it were padded to 4 with 0's -- cgit v1.2.3