Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-01 00:00:02 -04:00
Code Issues Projects Releases Wiki Activity

#651: Fix ExtraSamplesColorModel to create correct length elements array.

Browse Source
This commit is contained in:
Harald Kuhr
2021-12-24 12:25:31 +01:00
parent f50178bc78
commit 433311c10d
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/ExtraSamplesColorModel.java
+24 -4
View File
@@ -34,10 +34,7 @@ import com.twelvemonkeys.lang.Validate;
import java.awt.*;
import java.awt.color.ColorSpace;
import java.awt.image.ComponentColorModel;
import java.awt.image.ComponentSampleModel;
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
import java.awt.image.*;
import static java.awt.image.DataBuffer.getDataTypeSize;
@@ -99,4 +96,27 @@ final class ExtraSamplesColorModel extends ComponentColorModel {
private int getAlphaComponent() {
return super.getNumComponents() - 1;
}
@Override
public Object getDataElements(final int rgb, final Object pixel) {
return super.getDataElements(rgb, pixel == null ? createDataArray() : pixel);
}
private Object createDataArray() {
switch (transferType) {
case DataBuffer.TYPE_BYTE:
return new byte[numComponents];
case DataBuffer.TYPE_SHORT:
case DataBuffer.TYPE_USHORT:
return new short[numComponents];
case DataBuffer.TYPE_INT:
return new int[numComponents];
case DataBuffer.TYPE_FLOAT:
return new float[numComponents];
case DataBuffer.TYPE_DOUBLE:
return new double[numComponents];
}
throw new IllegalArgumentException("This method has not been implemented for transferType " + transferType);
}
}