From 28c662c5995c6d379dd3de0718db5d28990a3df2 Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 15 Nov 2022 22:05:45 -0500 Subject: aviio.cpp, msdib.cpp: Use core inline functions as appropriate --- src/lib/util/aviio.cpp | 10 ++-------- src/lib/util/msdib.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lib/util/aviio.cpp b/src/lib/util/aviio.cpp index 3a3a1a412f6..e4865059676 100644 --- a/src/lib/util/aviio.cpp +++ b/src/lib/util/aviio.cpp @@ -1077,10 +1077,7 @@ avi_file::error avi_stream::yuv_decompress_to_yuy16(const std::uint8_t *data, st case FORMAT_VYUY: case FORMAT_YUY2: for (x = 0; x < m_width && source < dataend; x++) - { - std::uint16_t pix = *source++; - *dest++ = (pix >> 8) | (pix << 8); - } + *dest++ = swapendian_int16(*source++); break; } } @@ -1129,10 +1126,7 @@ avi_file::error avi_stream::yuy16_compress_to_yuy(const bitmap_yuy16 &bitmap, st case FORMAT_VYUY: case FORMAT_YUY2: for (x = 0; x < m_width && dest < dataend; x++) - { - std::uint16_t pix = *source++; - *dest++ = (pix >> 8) | (pix << 8); - } + *dest++ = swapendian_int16(*source++); break; } } diff --git a/src/lib/util/msdib.cpp b/src/lib/util/msdib.cpp index 3120e8cb68c..6ce0e0fd990 100644 --- a/src/lib/util/msdib.cpp +++ b/src/lib/util/msdib.cpp @@ -627,10 +627,10 @@ msdib_error msdib_read_bitmap_data(random_read &fp, bitmap_argb32 &bitmap, std:: } else { - std::uint8_t r(dib_splat_sample((pix >> red_shift) & ((std::uint32_t(1) << red_bits) - 1), red_bits)); - std::uint8_t g(dib_splat_sample((pix >> green_shift) & ((std::uint32_t(1) << green_bits) - 1), green_bits)); - std::uint8_t b(dib_splat_sample((pix >> blue_shift) & ((std::uint32_t(1) << blue_bits) - 1), blue_bits)); - std::uint8_t a(dib_splat_sample((pix >> alpha_shift) & ((std::uint32_t(1) << alpha_bits) - 1), alpha_bits)); + std::uint8_t r(dib_splat_sample(BIT(pix, red_shift, red_bits), red_bits)); + std::uint8_t g(dib_splat_sample(BIT(pix, green_shift, green_bits), green_bits)); + std::uint8_t b(dib_splat_sample(BIT(pix, blue_shift, blue_bits), blue_bits)); + std::uint8_t a(dib_splat_sample(BIT(pix, alpha_shift, alpha_bits), alpha_bits)); *dest = rgb_t(alpha_bits ? a : 255, r, g, b); } } -- cgit v1.2.3