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

Rename the flag and skip normalization completely

Browse Source
This commit is contained in:
Bertil Chapuis 2023-12-22 00:35:07 +01:00 committed by Harald Kuhr
parent 1226375ba6
commit 57d9bfda59
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
View File

@ -933,7 +933,7 @@ public final class TIFFImageReader extends ImageReaderBase {
return read(imageIndex, param, true);
}
private BufferedImage read(int imageIndex, ImageReadParam param, boolean clamped) throws IOException {
private BufferedImage read(int imageIndex, ImageReadParam param, boolean normalize) throws IOException {
readIFD(imageIndex);
int width = getWidth(imageIndex);
@ -1148,7 +1148,7 @@ public final class TIFFImageReader extends ImageReaderBase {
}
// Read a full strip/tile
readStripTileData(clippedRow, srcRegion, xSub, ySub, b, samplesInTile, interpretation, destRaster, col, srcRow, colsInTile, rowsInTile, input, clamped);
readStripTileData(clippedRow, srcRegion, xSub, ySub, b, samplesInTile, interpretation, destRaster, col, srcRow, colsInTile, rowsInTile, input, normalize);
}
}
@ -1924,7 +1924,7 @@ public final class TIFFImageReader extends ImageReaderBase {
private void readStripTileData(final Raster tileRowRaster, final Rectangle srcRegion, final int xSub, final int ySub,
final int band, final int numBands, final int interpretation,
final WritableRaster raster, final int startCol, final int startRow,
final int colsInTile, final int rowsInTile, final ImageInputStream input, final boolean clamped)
final int colsInTile, final int rowsInTile, final ImageInputStream input, final boolean normalize)
throws IOException {
DataBuffer dataBuffer = tileRowRaster.getDataBuffer();
@ -2047,7 +2047,9 @@ public final class TIFFImageReader extends ImageReaderBase {
}
if (row >= srcRegion.y) {
normalizeColor(interpretation, numBands, rowDataFloat, clamped);
if (normalize) {
normalizeColor(interpretation, numBands, rowDataFloat);
}
// Subsample horizontal
if (xSub != 1) {
@ -2357,11 +2359,9 @@ public final class TIFFImageReader extends ImageReaderBase {
}
}
private void normalizeColor(int photometricInterpretation, @SuppressWarnings("unused") int numBands, float[] data, boolean clamped) {
private void normalizeColor(int photometricInterpretation, @SuppressWarnings("unused") int numBands, float[] data) {
// TODO: Allow param to decide tone mapping strategy, like in the HDRImageReader
if (clamped) {
clamp(data);
}
clamp(data);
switch (photometricInterpretation) {
case TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO: