Skip to content
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

Microsoft Direct DrawSurface (DDS) support. #1021

Merged
merged 23 commits into from
Sep 25, 2024
Merged

Microsoft Direct DrawSurface (DDS) support. #1021

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
82bf485
Basic wrapper around DDSReader.
p4paul Sep 13, 2024
ec7635d
Read header (DDSHeader) and pass into DDSReader
p4paul Sep 16, 2024
120d6eb
Fix pixel order to ARGB
p4paul Sep 16, 2024
0cd056a
Push ImageInputStream into DDSReader
p4paul Sep 17, 2024
7082a53
Added processImageStarted and stubbed out processImageProgress and pr…
p4paul Sep 17, 2024
79aef6e
Remove offset and use imageInput.readFully
p4paul Sep 18, 2024
7eb45b1
Code cleanup and added exception handling.
p4paul Sep 19, 2024
dede5ea
Use Enum DDSType instead of int values.
p4paul Sep 19, 2024
be2d6d6
Update imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/pl…
p4paul Sep 24, 2024
771e486
Update imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/pl…
p4paul Sep 24, 2024
53356e7
Delete .run directory
p4paul Sep 24, 2024
bcfab45
Format tabs -> 4 spaces
p4paul Sep 24, 2024
a648d1a
Convert 4byte array into %08x string format.
p4paul Sep 24, 2024
e95d403
Don't need to expose classes outside the package
p4paul Sep 24, 2024
789cbe8
(fix) wrong public...
p4paul Sep 24, 2024
edf132b
Move setByteOrder to DDSImageReader.readHeader
p4paul Sep 24, 2024
05f754f
Use imageIndex to calculate height/width and buffer offset.
p4paul Sep 24, 2024
71a4e73
Delete .gitignore
p4paul Sep 24, 2024
f530f9d
Revert "Delete .gitignore"
p4paul Sep 25, 2024
697f41a
Undelete/Restore .gitignore
p4paul Sep 25, 2024
25cf58d
Simplify String.format into one.
p4paul Sep 25, 2024
4f9681b
Override failing tests and ignore.
p4paul Sep 25, 2024
1dec762
Revert formatting on PNGImageReaderTest.java
p4paul Sep 25, 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
Prev Previous commit
Next Next commit
Update imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/pl… 
…ugins/dds/DDSHeader.java


Improve IIOException "Invalid DDS header size"

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>
  • Loading branch information
@p4paul @haraldk
p4paul and haraldk authored Sep 24, 2024
commit be2d6d60535ff7fa8a930a24d4bd7122ac9d0b65
2 changes: 1 addition & 1 deletion imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static DDSHeader read(final ImageInputStream imageInput) throws IOExcepti
// https://learn.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
int dwSize = imageInput.readInt(); // [4,7]
if (dwSize != DDS.HEADER_SIZE) {
throw new IIOException("Invalid header size: " + dwSize);
throw new IIOException(String.format("Invalid DDS header size (expected %d): %d", DDS.HEADER_SIZE, dwSize);
}

// Verify flags
Expand Down