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

Decode alpha using source dimensions and copy to destination later.

Browse Source
This commit is contained in:
tc-wleite 2023-03-14 21:01:29 -03:00
parent 0ebd18fcb6
commit 703848ca45
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,7 +527,8 @@ final class WebPImageReader extends ImageReaderBase {
System.out.println("compression: " + compression); System.out.println("compression: " + compression);
} }
WritableRaster alphaRaster = destination.getAlphaRaster(); // Alpha raster must have same dimensions as the source, because of gradient filtering.
WritableRaster alphaRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 1, null);
switch (compression) { switch (compression) {
case 0: case 0:
readUncompressedAlpha(alphaRaster); readUncompressedAlpha(alphaRaster);
@ -536,8 +537,8 @@ final class WebPImageReader extends ImageReaderBase {
// Simulate header // Simulate header
imageInput.seek(imageInput.getStreamPosition() - 5); imageInput.seek(imageInput.getStreamPosition() - 5);
WritableRaster tempRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, destination.getWidth(), destination.getHeight(), 4, null); WritableRaster tempRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 4, null);
readVP8Lossless(tempRaster, param, width, height); readVP8Lossless(tempRaster, null, width, height);
// Copy from green (band 1) in temp to alpha in destination // Copy from green (band 1) in temp to alpha in destination
alphaRaster.setRect(tempRaster.createChild(0, 0, tempRaster.getWidth(), tempRaster.getHeight(), 0, 0, new int[] {1})); alphaRaster.setRect(tempRaster.createChild(0, 0, tempRaster.getWidth(), tempRaster.getHeight(), 0, 0, new int[] {1}));
@ -549,13 +550,17 @@ final class WebPImageReader extends ImageReaderBase {
} }
if (filtering != AlphaFiltering.NONE) { if (filtering != AlphaFiltering.NONE) {
for (int y = 0; y < destination.getHeight(); y++) { for (int y = 0; y < height; y++) {
for (int x = 0; x < destination.getWidth(); x++) { for (int x = 0; x < width; x++) {
int predictorAlpha = getPredictorAlpha(alphaRaster, filtering, y, x); int predictorAlpha = getPredictorAlpha(alphaRaster, filtering, y, x);
alphaRaster.setSample(x, y, 0, alphaRaster.getSample(x, y, 0) + predictorAlpha % 256); alphaRaster.setSample(x, y, 0, alphaRaster.getSample(x, y, 0) + predictorAlpha % 256);
} }
} }
} }
// Copy into destination raster
WritableRaster dstRaster = destination.getAlphaRaster();
VP8LDecoder.copyIntoRasterWithParams(alphaRaster, dstRaster, param);
} }
private int getPredictorAlpha(WritableRaster alphaRaster, int filtering, int y, int x) { private int getPredictorAlpha(WritableRaster alphaRaster, int filtering, int y, int x) {