Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 12:05:29 -04:00
Code Issues Projects Releases Wiki Activity

#672: WebPImageReader now supports unknown stream lengths

Browse Source
This commit is contained in:
Harald Kuhr 2022-04-22 14:41:57 +02:00
parent a33dbaf897
commit 9fe87fe10d
2 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/WebPImageReader.java
View File

@ -31,6 +31,28 @@
package com.twelvemonkeys.imageio.plugins.webp; package com.twelvemonkeys.imageio.plugins.webp;
import java.awt.*;
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.BufferedImage;
import java.awt.image.ColorConvertOp;
import java.awt.image.ColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import javax.imageio.IIOException;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.spi.ImageReaderSpi;
import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.ImageReaderBase;
import com.twelvemonkeys.imageio.color.ColorProfiles; import com.twelvemonkeys.imageio.color.ColorProfiles;
import com.twelvemonkeys.imageio.color.ColorSpaces; import com.twelvemonkeys.imageio.color.ColorSpaces;
@ -45,23 +67,6 @@ import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
import com.twelvemonkeys.imageio.util.ProgressListenerBase; import com.twelvemonkeys.imageio.util.ProgressListenerBase;
import com.twelvemonkeys.imageio.util.RasterUtils; import com.twelvemonkeys.imageio.util.RasterUtils;
import javax.imageio.IIOException;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.spi.ImageReaderSpi;
import java.awt.*;
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.*;
import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/** /**
* WebPImageReader * WebPImageReader
*/ */
@ -72,6 +77,7 @@ final class WebPImageReader extends ImageReaderBase {
private LSBBitReader lsbBitReader; private LSBBitReader lsbBitReader;
// Either VP8_, VP8L or VP8X chunk // Either VP8_, VP8L or VP8X chunk
private long fileSize;
private VP8xChunk header; private VP8xChunk header;
private ICC_Profile iccProfile; private ICC_Profile iccProfile;
private final List<AnimationFrame> frames = new ArrayList<>(); private final List<AnimationFrame> frames = new ArrayList<>();
@ -82,6 +88,7 @@ final class WebPImageReader extends ImageReaderBase {
@Override @Override
protected void resetMembers() { protected void resetMembers() {
fileSize = -1;
header = null; header = null;
iccProfile = null; iccProfile = null;
lsbBitReader = null; lsbBitReader = null;
@ -119,7 +126,7 @@ final class WebPImageReader extends ImageReaderBase {
RIFFChunk frame = frames.isEmpty() ? header : frames.get(frames.size() - 1); RIFFChunk frame = frames.isEmpty() ? header : frames.get(frames.size() - 1);
imageInput.seek(frame.offset + frame.length); imageInput.seek(frame.offset + frame.length);
while (imageInput.getStreamPosition() < imageInput.length()) { while (imageInput.getStreamPosition() < fileSize) {
int nextChunk = imageInput.readInt(); int nextChunk = imageInput.readInt();
long chunkLength = imageInput.readUnsignedInt(); long chunkLength = imageInput.readUnsignedInt();
long chunkStart = imageInput.getStreamPosition(); long chunkStart = imageInput.getStreamPosition();
@ -184,7 +191,7 @@ final class WebPImageReader extends ImageReaderBase {
throw new IIOException(String.format("Not a WebP file, invalid 'RIFF' magic: '%s'", fourCC(riff))); throw new IIOException(String.format("Not a WebP file, invalid 'RIFF' magic: '%s'", fourCC(riff)));
} }
imageInput.readUnsignedInt(); // Skip file size NOTE: LITTLE endian! fileSize = 8 + imageInput.readUnsignedInt(); // 8 + RIFF container length (LITTLE endian) == file size
int webp = imageInput.readInt(); int webp = imageInput.readInt();
if (webp != WebP.WEBP_MAGIC) { if (webp != WebP.WEBP_MAGIC) {
@ -282,7 +289,7 @@ final class WebPImageReader extends ImageReaderBase {
if (header.containsICCP) { if (header.containsICCP) {
// ICCP chunk must be first chunk, if present // ICCP chunk must be first chunk, if present
while (iccProfile == null && imageInput.getStreamPosition() < imageInput.length()) { while (iccProfile == null && imageInput.getStreamPosition() < fileSize) {
int nextChunk = imageInput.readInt(); int nextChunk = imageInput.readInt();
long chunkLength = imageInput.readUnsignedInt(); long chunkLength = imageInput.readUnsignedInt();
long chunkStart = imageInput.getStreamPosition(); long chunkStart = imageInput.getStreamPosition();
@ -305,6 +312,7 @@ final class WebPImageReader extends ImageReaderBase {
} }
if (DEBUG) { if (DEBUG) {
System.out.println("file size: " + fileSize + " (stream length: " + imageInput.length() + ")");
System.out.println("header: " + header); System.out.println("header: " + header);
} }
} }
@ -422,7 +430,7 @@ final class WebPImageReader extends ImageReaderBase {
} }
else { else {
imageInput.seek(header.offset + header.length); imageInput.seek(header.offset + header.length);
readVP8Extended(destination, param, imageInput.length()); readVP8Extended(destination, param, fileSize);
} }
break; break;
@ -591,7 +599,7 @@ final class WebPImageReader extends ImageReaderBase {
// TODO: WebP spec says possible EXIF and XMP chunks are always AFTER image data // TODO: WebP spec says possible EXIF and XMP chunks are always AFTER image data
imageInput.seek(header.offset + header.length); imageInput.seek(header.offset + header.length);
while (imageInput.getStreamPosition() < imageInput.length()) { while (imageInput.getStreamPosition() < fileSize) {
int nextChunk = imageInput.readInt(); int nextChunk = imageInput.readInt();
long chunkLength = imageInput.readUnsignedInt(); long chunkLength = imageInput.readUnsignedInt();
long chunkStart = imageInput.getStreamPosition(); long chunkStart = imageInput.getStreamPosition();

41
imageio/imageio-webp/src/test/java/com/twelvemonkeys/imageio/plugins/webp/WebPImageReaderTest.java
View File

@ -1,20 +1,22 @@
package com.twelvemonkeys.imageio.plugins.webp; package com.twelvemonkeys.imageio.plugins.webp;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import static java.util.Arrays.asList;
import org.junit.Test; import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.List;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam; import javax.imageio.ImageReadParam;
import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageTypeSpecifier;
import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import java.awt.*; import javax.imageio.stream.MemoryCacheImageInputStream;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.List;
import static java.util.Arrays.asList; import org.junit.Test;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
/** /**
* WebPImageReaderTest * WebPImageReaderTest
@ -102,4 +104,29 @@ public class WebPImageReaderTest extends ImageReaderAbstractTest<WebPImageReader
reader.dispose(); reader.dispose();
} }
} }
@Test
public void testReadFromUnknownStreamLength() throws IOException {
// See #672, image was not decoded and returned all black, when the stream length was unknown (-1).
WebPImageReader reader = createReader();
try (ImageInputStream stream = new MemoryCacheImageInputStream(getClassLoaderResource("/webp/photo-iccp-adobergb.webp").openStream()) {
@Override public long length() {
return -1;
}
}) {
reader.setInput(stream);
// We'll read a small portion of the image into a destination type that use sRGB
ImageReadParam param = new ImageReadParam();
param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR));
param.setSourceRegion(new Rectangle(10, 10, 20, 20));
BufferedImage image = reader.read(0, param);
assertRGBEquals("RGB values differ, image all black?", 0xFFEC9800, image.getRGB(5, 5), 8);
}
finally {
reader.dispose();
}
}
} }