python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-12 10:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for DXT3 to DdsImagePlugin

Browse Source
This commit is contained in:
Robert Nix 2016-08-25 20:12:44 -05:00
parent 18a91cebcf
commit b46804ea27
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PIL/DdsImagePlugin.py
View File

@ -122,6 +122,9 @@ class DdsImageFile(ImageFile.ImageFile):
if fourcc == b"DXT1": if fourcc == b"DXT1":
self.pixel_format = "DXT1" self.pixel_format = "DXT1"
n = 1 n = 1
elif fourcc == b"DXT3":
self.pixel_format = "DXT3"
n = 2
elif fourcc == b"DXT5": elif fourcc == b"DXT5":
self.pixel_format = "DXT5" self.pixel_format = "DXT5"
n = 3 n = 3

BIN
Tests/images/dxt3-argb-8bbp-explicitalpha_MipMaps-1.dds
View File

Binary file not shown.

BIN
Tests/images/dxt3-argb-8bbp-explicitalpha_MipMaps-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

17
Tests/test_file_dds.py
View File

@ -36,12 +36,21 @@ class TestFileDds(PillowTestCase):
self.assertEqual(im.mode, "RGBA") self.assertEqual(im.mode, "RGBA")
self.assertEqual(im.size, (256, 256)) self.assertEqual(im.size, (256, 256))
self.assert_image_equal(target, im, 5) self.assert_image_equal(target, im)
def test_sanity_dxt3(self): def test_sanity_dxt3(self):
"""Check DXT3 images are not supported""" """Check DXT3 images can be opened"""
self.assertRaises(NotImplementedError,
lambda: Image.open(TEST_FILE_DXT3)) target = Image.open(TEST_FILE_DXT3.replace('.dds', '.png'))
im = Image.open(TEST_FILE_DXT3)
im.load()
self.assertEqual(im.format, "DDS")
self.assertEqual(im.mode, "RGBA")
self.assertEqual(im.size, (256, 256))
self.assert_image_equal(target, im)
def test__validate_true(self): def test__validate_true(self):
"""Check valid prefix""" """Check valid prefix"""

2
libImaging/BcnDecode.c
View File

@ -153,7 +153,7 @@ static void decode_bc1_block(rgba *col, const UINT8* src) {
static void decode_bc2_block(rgba *col, const UINT8* src) { static void decode_bc2_block(rgba *col, const UINT8* src) {
int n, bitI, byI, av; int n, bitI, byI, av;
decode_bc1_color(col, src); decode_bc1_color(col, src + 8);
for (n = 0; n < 16; n++) { for (n = 0; n < 16; n++) {
bitI = n * 4; bitI = n * 4;
byI = bitI >> 3; byI = bitI >> 3;