Support reading BC4U and DX10 BC1 images #6486

REDxEYE · 2022-08-06T21:05:16Z

Changes proposed in this pull request:

Refactored DDS reader/writter
Add Tile namedtuple for code readability
Add support for reading/writing single channel DDS textures

REDxEYE · 2022-08-06T21:55:47Z

Is it possible to make pre-commit.ci not to reformat some parts of the code?

radarhere · 2022-08-07T03:55:29Z

Yes. There is # fmt: off and # fmt: on. See https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#code-style for documentation.

radarhere · 2022-08-26T00:56:43Z

src/PIL/Image.py

+        ("offset", int),
+        ("tile_args", Tuple),
+    ],
+)


Could you say a few words about why this is helpful?

I've added it to understand what tile structure is. I didn't found any doc for it, so i scouted sources to understand what everything mean

src/PIL/DdsImagePlugin.py

radarhere · 2022-10-18T10:31:55Z

src/PIL/DdsImagePlugin.py

+    NV12 = 103
+    P010 = 104
+    P016 = 105
+    _420_OPAQUE = 106


Just to note - this should be 420_OPAQUE, but you've prefixed it with an underscore because otherwise Python will throw a SyntaxError.

Is there any better way around this?

No, I don't think so, not while using an enum.

How about OPAQUE_420? Some might think it's private with a leading underscore.

radarhere · 2022-12-26T10:13:04Z

I extracted the support for single channel images, and it has been merged as PR #6820.

REDxEYE · 2022-12-26T10:24:57Z

Awesome!

Add typing info to Image.tile

for more information, see https://pre-commit.ci

Moved _Tile from Image to ImageFile

REDxEYE · 2023-12-03T00:32:37Z

A bit offtop. I may work on adding support for PVR textures in some time. I already implemented ETC decoder(one of they compression formats) https://github.com/REDxEYE/TextureDecoder/blob/master/library/src/decoders/etc/etc1.cpp

Tests/test_file_dds.py

hugovk

Thanks!

Let's also add release notes for this (can be in a followup PR) and retitle the PR for the most important thing ("Add support for ..."?).

hugovk · 2023-12-05T07:26:18Z

src/PIL/DdsImagePlugin.py

+    NV12 = 103
+    P010 = 104
+    P016 = 105
+    _420_OPAQUE = 106


How about OPAQUE_420? Some might think it's private with a leading underscore.

src/PIL/DdsImagePlugin.py

radarhere · 2023-12-05T08:33:29Z

I've retitled the PR, and added release notes. The release notes also cover #7603

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

hugovk · 2023-12-05T13:40:39Z

docs/releasenotes/10.2.0.rst

+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``DDSD``, ``DDSCAPS``, ``DDSCAPS2``, ``DDPF``, ``DXGI_FORMAT`` and ``D3DFMT``
+enums have been added to DdsImagePlugin.


Suggested change

enums have been added to DdsImagePlugin.

enums have been added to py:class:`PIL.DdsImagePlugin`.

docs/releasenotes/10.2.0.rst

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

hugovk · 2023-12-06T20:51:39Z

Thank you for your patience! This will be in the next release, set for 2nd January 2024.

REDxEYE marked this pull request as draft August 6, 2022 21:05

REDxEYE force-pushed the improved_dds branch from 2907bb2 to faebb96 Compare August 25, 2022 12:49

REDxEYE marked this pull request as ready for review August 25, 2022 13:15

radarhere reviewed Aug 26, 2022

View reviewed changes

src/PIL/DdsImagePlugin.py Outdated Show resolved Hide resolved

REDxEYE requested a review from radarhere August 26, 2022 20:53

radarhere reviewed Oct 8, 2022

View reviewed changes

src/PIL/DdsImagePlugin.py Outdated Show resolved Hide resolved

radarhere reviewed Oct 8, 2022

View reviewed changes

src/PIL/DdsImagePlugin.py Outdated Show resolved Hide resolved

radarhere mentioned this pull request Oct 8, 2022

Fixed big-endian bug REDxEYE/Pillow#3

Merged

radarhere reviewed Oct 18, 2022

View reviewed changes

radarhere mentioned this pull request Dec 23, 2022

Added DDS support for uncompressed L and LA images #6820

Merged

radarhere added the Needs Rebase label Dec 26, 2022

radarhere removed the Needs Rebase label Dec 26, 2022

radarhere added the Needs Rebase label Apr 1, 2023

REDxEYE and others added 12 commits June 15, 2023 02:27

Add IntEnum/IntFlag for most of DDS members

f2d91fc

Add Tile namedtuple for code readability.

de2b4be

Add typing info to Image.tile

Remove unused constants

3f77a9e

Add support for single channel textures

1988737

[pre-commit.ci] auto fixes from pre-commit.com hooks

3602e35

for more information, see https://pre-commit.ci

Remove unnecessary tuple creation

429dc28

Fix incorect file name

8e8a67e

Add support for writing LA dds textures

de8b89c

[pre-commit.ci] auto fixes from pre-commit.com hooks

a63fdc2

for more information, see https://pre-commit.ci

Add missing LA test textures

3476073

Fix file extensions in tests not matching real names

d1b1f30

Small refactor

7c25e0b

radarhere and others added 4 commits December 2, 2023 21:36

Removed support for RGB bitcount 8

ab96324

Moved _Tile to ImageFile

5aadeb5

Corrected constant values

e072a12

Merge pull request #10 from radarhere/improved_dds

9e5ff76

Moved _Tile from Image to ImageFile

radarhere approved these changes Dec 3, 2023

View reviewed changes

radarhere changed the title ~~Refactor DDS plugin~~ Added enums to DdsImagePlugin Dec 3, 2023

radarhere reviewed Dec 3, 2023

View reviewed changes

Tests/test_file_dds.py Outdated Show resolved Hide resolved

radarhere reviewed Dec 3, 2023

View reviewed changes

Tests/test_file_dds.py Outdated Show resolved Hide resolved

Updated docstrings

2eddbc5

radarhere mentioned this pull request Dec 4, 2023

Added support for reading DX10 BC4 DDS images #7603

Merged

Merge branch 'main' into improved_dds

f2e478e

hugovk approved these changes Dec 5, 2023

View reviewed changes

radarhere changed the title ~~Added enums to DdsImagePlugin~~ Support reading BC4U and DX10 BC1 images Dec 5, 2023

Added release notes

66c5e9a

Rename _420_OPAQUE to OPAQUE_420

9e6030f

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

hugovk approved these changes Dec 5, 2023

View reviewed changes

hugovk mentioned this pull request Dec 5, 2023

Optimize ImageStat.Stat.extrema #7593

Merged

radarhere reviewed Dec 5, 2023

View reviewed changes

docs/releasenotes/10.2.0.rst Outdated Show resolved Hide resolved

radarhere force-pushed the improved_dds branch 2 times, most recently from b8aa548 to 306b58a Compare December 5, 2023 21:13

Link to plugin

00c6a89

radarhere force-pushed the improved_dds branch from 306b58a to 00c6a89 Compare December 6, 2023 00:10

hugovk reviewed Dec 6, 2023

View reviewed changes

docs/releasenotes/10.2.0.rst Outdated Show resolved Hide resolved

hugovk reviewed Dec 6, 2023

View reviewed changes

docs/releasenotes/10.2.0.rst Outdated Show resolved Hide resolved

hugovk reviewed Dec 6, 2023

View reviewed changes

docs/releasenotes/10.2.0.rst Outdated Show resolved Hide resolved

Added tilde prefix

d1a2235

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

hugovk merged commit 7cc0482 into python-pillow:main Dec 6, 2023
57 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support reading BC4U and DX10 BC1 images #6486

Support reading BC4U and DX10 BC1 images #6486

REDxEYE commented Aug 6, 2022

REDxEYE commented Aug 6, 2022

radarhere commented Aug 7, 2022

radarhere Aug 26, 2022

REDxEYE Aug 26, 2022

radarhere Oct 18, 2022

REDxEYE Oct 18, 2022

radarhere Oct 18, 2022

hugovk Dec 5, 2023

radarhere commented Dec 26, 2022

REDxEYE commented Dec 26, 2022

REDxEYE commented Dec 3, 2023

hugovk left a comment

hugovk Dec 5, 2023

radarhere commented Dec 5, 2023

hugovk Dec 5, 2023

hugovk commented Dec 6, 2023

	enums have been added to DdsImagePlugin.
	enums have been added to py:class:`PIL.DdsImagePlugin`.

Support reading BC4U and DX10 BC1 images #6486

Support reading BC4U and DX10 BC1 images #6486

Conversation

REDxEYE commented Aug 6, 2022

REDxEYE commented Aug 6, 2022

radarhere commented Aug 7, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

radarhere commented Dec 26, 2022

REDxEYE commented Dec 26, 2022

REDxEYE commented Dec 3, 2023

hugovk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

radarhere commented Dec 5, 2023

Choose a reason for hiding this comment

hugovk commented Dec 6, 2023