From edf132b73808cc4ee995b0008f49af20754f9be2 Mon Sep 17 00:00:00 2001 From: Paul Allen Date: Tue, 24 Sep 2024 11:17:03 +0100 Subject: [PATCH] Move setByteOrder to DDSImageReader.readHeader --- .../java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java | 4 +--- .../com/twelvemonkeys/imageio/plugins/dds/DDSImageReader.java | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java b/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java index 46527104..ab6eb0ba 100644 --- a/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java +++ b/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSHeader.java @@ -25,9 +25,7 @@ final class DDSHeader { public static DDSHeader read(final ImageInputStream imageInput) throws IOException { DDSHeader header = new DDSHeader(); - - imageInput.setByteOrder(ByteOrder.LITTLE_ENDIAN); - + // Read MAGIC bytes [0,3] byte[] magic = new byte[DDS.MAGIC.length]; imageInput.readFully(magic); diff --git a/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSImageReader.java b/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSImageReader.java index c2ac4558..ed2d39d9 100644 --- a/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSImageReader.java +++ b/imageio/imageio-dds/src/main/java/com/twelvemonkeys/imageio/plugins/dds/DDSImageReader.java @@ -10,6 +10,7 @@ import javax.imageio.spi.ImageReaderSpi; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.nio.ByteOrder; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -86,6 +87,7 @@ public final class DDSImageReader extends ImageReaderBase { private void readHeader() throws IOException { if (header == null) { + imageInput.setByteOrder(ByteOrder.LITTLE_ENDIAN); header = DDSHeader.read(imageInput); imageInput.flushBefore(imageInput.getStreamPosition());