Skip to content

Fix shift-sign issue in Convert.c #7838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radarhere merged 3 commits into from
Mar 9, 2024
Merged

Fix shift-sign issue in Convert.c #7838

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fe0d63
Fix shift-sign issue in Convert.c
r-barnes Feb 27, 2024
42620f1
Leave unshifted int unchanged
radarhere Mar 9, 2024
6432ec4
Leave bitwise and operations unchanged
radarhere Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libImaging/Convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,10 +507,10 @@ rgba2rgb_(UINT8 *out, const UINT8 *in, int xsize) {
static void
rgbT2rgba(UINT8 *out, int xsize, int r, int g, int b) {
#ifdef WORDS_BIGENDIAN
UINT32 trns = ((r & 0xff) << 24) | ((g & 0xff) << 16) | ((b & 0xff) << 8) | 0xff;
UINT32 trns = ((r & 0xffU) << 24) | ((g & 0xffU) << 16) | ((b & 0xffU) << 8) | 0xff;
UINT32 repl = trns & 0xffffff00;
#else
UINT32 trns = (0xff << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
UINT32 trns = (0xffU << 24) | ((b & 0xffU) << 16) | ((g & 0xffU) << 8) | (r & 0xff);
UINT32 repl = trns & 0x00ffffff;
#endif

Expand Down