Skip to content

[IMAGING-383/384] Handle grayscale PNG ICC profiles #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dajiaohuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[IMAGING-383/384] Handle grayscale PNG ICC profiles #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
package org.apache.commons.imaging.formats.png;

import java.awt.Dimension;
import java.awt.Transparency;
import java.awt.color.CMMException;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.ComponentColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.ImagingOpException;
import java.awt.image.WritableRaster;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -303,14 +309,22 @@ public BufferedImage getBufferedImage(final ByteSource byteSource, final PngImag
abstractScanExpediter.drive();

if (iccProfile != null) {
final boolean isSrgb = new IccProfileParser().isSrgb(iccProfile);
if (!isSrgb) {
final ICC_ColorSpace cs = new ICC_ColorSpace(iccProfile);
try {
final boolean isSrgb = new IccProfileParser().isSrgb(iccProfile);
if (!isSrgb) {
final ICC_ColorSpace cs = new ICC_ColorSpace(iccProfile);

if (pngColorType.isGreyscale() && hasAlpha && cs.getType() == ColorSpace.TYPE_GRAY) {
result = createGrayAlphaImage(result, cs);
}

final ColorModel srgbCM = ColorModel.getRGBdefault();
final ColorSpace csSrgb = srgbCM.getColorSpace();
final ColorModel srgbCM = ColorModel.getRGBdefault();
final ColorSpace csSrgb = srgbCM.getColorSpace();

result = new ColorTools().convertBetweenColorSpaces(result, cs, csSrgb);
result = new ColorTools().convertBetweenColorSpaces(result, cs, csSrgb);
}
} catch (final CMMException | ImagingOpException | IllegalArgumentException exception) {
throw new ImagingException("PNG: could not apply ICC profile", exception);
}
}

Expand All @@ -320,6 +334,19 @@ public BufferedImage getBufferedImage(final ByteSource byteSource, final PngImag

}

private BufferedImage createGrayAlphaImage(final BufferedImage source, final ColorSpace colorSpace) {
final ColorModel colorModel = new ComponentColorModel(colorSpace, true, false, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE);
final WritableRaster raster = colorModel.createCompatibleWritableRaster(source.getWidth(), source.getHeight());
for (int y = 0; y < source.getHeight(); y++) {
for (int x = 0; x < source.getWidth(); x++) {
final int argb = source.getRGB(x, y);
raster.setSample(x, y, 0, argb >> 16 & 0xff);
raster.setSample(x, y, 1, argb >>> 24);
}
}
return new BufferedImage(colorModel, raster, false, null);
}

/**
* Reads PNG chunk types from an input stream.
*
Expand Down
125 changes: 125 additions & 0 deletions src/test/java/org/apache/commons/imaging/formats/png/PngIccProfileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.imaging.formats.png;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.zip.CRC32;
import java.util.zip.DeflaterOutputStream;

import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
import org.junit.jupiter.api.Test;

class PngIccProfileTest {

@Test
void grayscaleAlphaPngAcceptsGrayProfile() throws IOException {
final byte[] png = createPng(4, ICC_Profile.getInstance(ColorSpace.CS_GRAY).getData());

final BufferedImage image = assertDoesNotThrow(() -> Imaging.getBufferedImage(png));

final int argb = image.getRGB(0, 0);
assertEquals(0x80, argb >>> 24);
assertEquals(argb >>> 16 & 0xff, argb >>> 8 & 0xff);
assertEquals(argb >>> 8 & 0xff, argb & 0xff);
}

@Test
void emptyGrayProfileIsReportedAsImagingException() throws IOException {
final byte[] png = createPng(0, createEmptyGrayProfile());

final ImagingException exception = assertThrows(ImagingException.class, () -> Imaging.getBufferedImage(png));
assertTrue(exception.getCause() instanceof java.awt.color.CMMException);
}

private static byte[] createPng(final int colorType, final byte[] profile) throws IOException {
final ByteArrayOutputStream output = new ByteArrayOutputStream();
final DataOutputStream png = new DataOutputStream(output);
png.write(new byte[] {(byte) 137, 80, 78, 71, 13, 10, 26, 10});

final byte[] header = ByteBuffer.allocate(13).order(ByteOrder.BIG_ENDIAN).putInt(1).putInt(1).put((byte) 8).put((byte) colorType)
.put((byte) 0).put((byte) 0).put((byte) 0).array();
writeChunk(png, "IHDR", header);

final ByteArrayOutputStream profileChunk = new ByteArrayOutputStream();
profileChunk.write("synthetic-gray".getBytes(StandardCharsets.ISO_8859_1));
profileChunk.write(0);
profileChunk.write(0);
profileChunk.write(deflate(profile));
writeChunk(png, "iCCP", profileChunk.toByteArray());

writeChunk(png, "IDAT", deflate(colorType == 4 ? new byte[] {0, 96, (byte) 128} : new byte[] {0, 96}));
writeChunk(png, "IEND", new byte[0]);
return output.toByteArray();
}

private static byte[] createEmptyGrayProfile() {
final ByteBuffer profile = ByteBuffer.allocate(132).order(ByteOrder.BIG_ENDIAN);
profile.putInt(132);
profile.putInt(0);
profile.putInt(0x04300000);
putAscii(profile, "mntr");
putAscii(profile, "GRAY");
putAscii(profile, "XYZ ");
profile.putShort((short) 2026).putShort((short) 1).putShort((short) 1);
profile.putShort((short) 0).putShort((short) 0).putShort((short) 0);
putAscii(profile, "acsp");
putAscii(profile, "APPL");
profile.putInt(0).putInt(0).putInt(0).putLong(0).putInt(0);
profile.putInt(0x0000f6d6).putInt(0x00010000).putInt(0x0000d32d);
putAscii(profile, "TEST");
profile.put(new byte[44]);
profile.putInt(0);
return profile.array();
}

private static void putAscii(final ByteBuffer buffer, final String value) {
buffer.put(value.getBytes(StandardCharsets.ISO_8859_1));
}

private static byte[] deflate(final byte[] input) throws IOException {
final ByteArrayOutputStream output = new ByteArrayOutputStream();
try (DeflaterOutputStream deflater = new DeflaterOutputStream(output)) {
deflater.write(input);
}
return output.toByteArray();
}

private static void writeChunk(final DataOutputStream png, final String type, final byte[] data) throws IOException {
final byte[] typeBytes = type.getBytes(StandardCharsets.ISO_8859_1);
png.writeInt(data.length);
png.write(typeBytes);
png.write(data);
final CRC32 crc = new CRC32();
crc.update(typeBytes);
crc.update(data);
png.writeInt((int) crc.getValue());
}
}