3.2 backports 202605 (PR #26447)

VZ

unread,

May 10, 2026, 7:30:45 PM (4 days ago) May 10

to wx-...@googlegroups.com, Subscribed

Latest backports, including the fixes to bitmap (and other file formats) loading.

cc @paulcor

You can view, comment on, or merge this pull request online at:

https://github.com/wxWidgets/wxWidgets/pull/26447

Commit Summary

98ec851 Remove CppUnit boilerplate in wxImage unit test
267237d Correct loading of `BI_BITFIELDS` bitmaps
e4b4f3b Add tests for reading truncated GIF image
1e9791a Fix loading BMP files which use 32bpp but do not have valid alpha
5ae7907 Fix loading ICO files with alpha broken by parent commit
31eab53 Fix loading ICO files with fully transparent alpha
861e95e Avoid memory overwrite on malformed BMP with invalid RLE data
641cf0e Avoid negative shift count with valid BMP file
c7378c6 Correct delta-RLE bitmap background colour
547dff4 Restore old delta-RLE bitmap background setting
1f33c4e Avoid assertion failure on BMP file with invalid or too-large size
2a72185 Reduce the scope of some local variables
4ccbac5 Up-scale BMP color components using Windows-compatible method
c5b5d96 Handle BMP alpha the same way Windows does
d3d3bfc Fix BMP test under Wine
5d34b0a Avoid out-of-bounds palette read in 8bpp BMP decoder
f559a31 Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
a97fa26 Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment

File Changes

(21 files)

M build/cmake/tests/gui/CMakeLists.txt (9)
M docs/changes.txt (7)
M src/common/imagbmp.cpp (250)
M src/common/imagpcx.cpp (7)
M src/common/xpmdecod.cpp (5)
M src/msw/dib.cpp (9)
M tests/Makefile.in (2)
A tests/image/32bpp_rgb.bmp (0)
A tests/image/32bpp_rgb.ico (0)
A tests/image/32bpp_rgb_a0.ico (0)
A tests/image/bad_truncated.gif (0)
A tests/image/badrle4.bmp (0)
A tests/image/bitfields-alpha.bmp (0)
M tests/image/image.cpp (345)
A tests/image/rgb16-3103.bmp (0)
A tests/image/rgb32-7187.bmp (0)
A tests/image/rgb32bf.bmp (0)
A tests/image/rgba32.bmp (0)
M tests/makefile.gcc (2)
M tests/makefile.vc (2)
M tests/test.bkl (11)

Patch Links:

—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.

VZ

unread,

May 10, 2026, 9:03:10 PM (4 days ago) May 10

to wx-...@googlegroups.com, Push

@vadz pushed 24 commits.

739f81e Stop using Catch::toString()
2fb2318 Avoid harmless -Wunused-variable in unit tests
d1a05d2 Log image information earlier in the image unit test
19639fe Relax checks for image equality in wxImage::ChangeColours
a678b62 Improve wxImage::ChangeColours test code
ace58a8 Improve TIFF saving test code
8730ac1 Remove CppUnit boilerplate in wxImage unit test
f096c2b Correct loading of `BI_BITFIELDS` bitmaps
685daf3 Add tests for reading truncated GIF image
7110383 Fix loading BMP files which use 32bpp but do not have valid alpha
8df9648 Fix loading ICO files with alpha broken by parent commit
4c0ebdc Fix loading ICO files with fully transparent alpha
cdfcfae Avoid memory overwrite on malformed BMP with invalid RLE data
59ec6aa Avoid negative shift count with valid BMP file
a0fc3bb Correct delta-RLE bitmap background colour
d2e1330 Restore old delta-RLE bitmap background setting
4518dbc Avoid assertion failure on BMP file with invalid or too-large size
a1ad945 Reduce the scope of some local variables
a8fbd4a Up-scale BMP color components using Windows-compatible method
e788a9d Handle BMP alpha the same way Windows does
0bab565 Fix BMP test under Wine
c586ebe Avoid out-of-bounds palette read in 8bpp BMP decoder
7ed5c6a Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
83e7fdb Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment

—
View it on GitHub or unsubscribe.

Triage notifications on the go with GitHub Mobile for iOS or Android.

You are receiving this because you are subscribed to this thread.

VZ

unread,

May 11, 2026, 8:49:22 AM (3 days ago) May 11

to wx-...@googlegroups.com, Push

@vadz pushed 23 commits.

e0faab1 Avoid harmless -Wunused-variable in unit tests
ce957f4 Log image information earlier in the image unit test
948c625 Relax checks for image equality in wxImage::ChangeColours
03d55cc Improve wxImage::ChangeColours test code
273a100 Improve TIFF saving test code
65a3974 Remove CppUnit boilerplate in wxImage unit test
5342ba2 Correct loading of `BI_BITFIELDS` bitmaps
33e6f77 Add tests for reading truncated GIF image
235cb8b Fix loading BMP files which use 32bpp but do not have valid alpha
b0db3a9 Fix loading ICO files with alpha broken by parent commit
2807118 Fix loading ICO files with fully transparent alpha
282d71e Avoid memory overwrite on malformed BMP with invalid RLE data
f5b1ffe Avoid negative shift count with valid BMP file
b30bb76 Correct delta-RLE bitmap background colour
4adc011 Restore old delta-RLE bitmap background setting
c83ef31 Avoid assertion failure on BMP file with invalid or too-large size
4b9915d Reduce the scope of some local variables
1c677c7 Up-scale BMP color components using Windows-compatible method
99cd1be Handle BMP alpha the same way Windows does
fa5dca6 Fix BMP test under Wine
94462af Avoid out-of-bounds palette read in 8bpp BMP decoder
ca1c3f7 Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
1a48898 Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment

—
View it on GitHub or unsubscribe.

Triage notifications on the go with GitHub Mobile for iOS or Android.

You are receiving this because you are subscribed to this thread.

VZ

unread,

May 11, 2026, 9:06:59 AM (3 days ago) May 11

to wx-...@googlegroups.com, Push

@vadz pushed 1 commit.

e9c086f Avoid another warning triggered by the last warning workaround

—
View it on GitHub or unsubscribe.

Triage notifications on the go with GitHub Mobile for iOS or Android.

You are receiving this because you are subscribed to this thread.

Reply all

Reply to author

Forward