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

Avoid creating another temporary raster, filtering on the tempRaster.

Browse Source
This commit is contained in:
tc-wleite 2023-03-15 17:23:53 -03:00
parent 9b727df901
commit 34e8d88007
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,8 +529,7 @@ final class WebPImageReader extends ImageReaderBase {
System.out.println("compression: " + compression); System.out.println("compression: " + compression);
} }
// Alpha raster must have same dimensions as the source, because of gradient filtering. WritableRaster alphaRaster = destination.getAlphaRaster();
WritableRaster alphaRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 1, null);
switch (compression) { switch (compression) {
case 0: case 0:
readUncompressedAlpha(alphaRaster); readUncompressedAlpha(alphaRaster);
@ -539,30 +538,31 @@ final class WebPImageReader extends ImageReaderBase {
// Simulate header // Simulate header
imageInput.seek(imageInput.getStreamPosition() - 5); imageInput.seek(imageInput.getStreamPosition() - 5);
// Temp alpha raster must have same dimensions as the source, because of filtering.
WritableRaster tempRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 4, null); WritableRaster tempRaster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 4, null);
readVP8Lossless(tempRaster, null, 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})); WritableRaster alphaChannel = tempRaster.createWritableChild(0, 0, tempRaster.getWidth(), tempRaster.getHeight(), 0, 0, new int[]{1});
alphaFilter(alphaChannel, filtering);
copyIntoRasterWithParams(alphaChannel, alphaRaster, param);
break; break;
default: default:
processWarningOccurred("Unknown WebP alpha compression: " + compression); processWarningOccurred("Unknown WebP alpha compression: " + compression);
opaqueAlpha(alphaRaster); opaqueAlpha(alphaRaster);
break; break;
} }
}
private void alphaFilter(WritableRaster alphaRaster, int filtering) {
if (filtering != AlphaFiltering.NONE) { if (filtering != AlphaFiltering.NONE) {
for (int y = 0; y < height; y++) { for (int y = 0; y < alphaRaster.getHeight(); y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < alphaRaster.getWidth(); 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();
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) {