File tree Expand file tree Collapse file tree 1 file changed +1
-16
lines changed Expand file tree Collapse file tree 1 file changed +1
-16
lines changed Original file line number Diff line number Diff line change @@ -32,28 +32,13 @@ const unsigned char pgfBlank[] = {
3232// class member definitions
3333
3434namespace Exiv2 {
35- static uint32_t byteSwap_ (uint32_t value, bool bSwap) {
36- #ifdef __cpp_lib_byteswap
37- return bSwap ? std::byteswap (value) : value;
38- #elif defined(_MSC_VER)
39- return bSwap ? _byteswap_ulong (value) : value;
40- #else
41- uint32_t result = 0 ;
42- result |= (value & 0x000000FF ) << 24 ;
43- result |= (value & 0x0000FF00 ) << 8 ;
44- result |= (value & 0x00FF0000 ) >> 8 ;
45- result |= (value & 0xFF000000 ) >> 24 ;
46- return bSwap ? result : value;
47- #endif
48- }
49-
5035static uint32_t byteSwap_ (Exiv2::DataBuf& buf, size_t offset, bool bSwap) {
5136 uint32_t v = 0 ;
5237 auto p = reinterpret_cast <byte*>(&v);
5338 int i;
5439 for (i = 0 ; i < 4 ; i++)
5540 p[i] = buf.read_uint8 (offset + i);
56- uint32_t result = byteSwap_ (v, bSwap);
41+ uint32_t result = Image::byteSwap (v, bSwap);
5742 p = reinterpret_cast <byte*>(&result);
5843 for (i = 0 ; i < 4 ; i++)
5944 buf.write_uint8 (offset + i, p[i]);
You can’t perform that action at this time.
0 commit comments