Merge pull request #4377 from ubyte/ubsan-signed-overflow

Avoid undefined signed overflow

Author: homm

src/libImaging/ImagingUtils.h

@@ -1,11 +1,11 @@
 #ifdef WORDS_BIGENDIAN
-    #define MAKE_UINT32(u0, u1, u2, u3) (u3 | (u2<<8) | (u1<<16) | (u0<<24))
+    #define MAKE_UINT32(u0, u1, u2, u3) ((UINT32)(u3) | ((UINT32)(u2)<<8) | ((UINT32)(u1)<<16) | ((UINT32)(u0)<<24))
     #define MASK_UINT32_CHANNEL_0 0xff000000
     #define MASK_UINT32_CHANNEL_1 0x00ff0000
     #define MASK_UINT32_CHANNEL_2 0x0000ff00
     #define MASK_UINT32_CHANNEL_3 0x000000ff
 #else
-    #define MAKE_UINT32(u0, u1, u2, u3) (u0 | (u1<<8) | (u2<<16) | (u3<<24))
+    #define MAKE_UINT32(u0, u1, u2, u3) ((UINT32)(u0) | ((UINT32)(u1)<<8) | ((UINT32)(u2)<<16) | ((UINT32)(u3)<<24))
     #define MASK_UINT32_CHANNEL_0 0x000000ff
     #define MASK_UINT32_CHANNEL_1 0x0000ff00
     #define MASK_UINT32_CHANNEL_2 0x00ff0000