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

Minor fix to the SOFn recognition + better warnings.

Browse Source
This commit is contained in:
Harald Kuhr 2012-02-07 13:05:49 +01:00
parent 11f9b2bdf8
commit e3dcca854b
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
View File

@ -321,7 +321,7 @@ public class JPEGImageReader extends ImageReaderBase {
).iterator(); ).iterator();
} }
else if (!imageTypes.hasNext() && profile != null) { else if (!imageTypes.hasNext() && profile != null) {
// TODO: Bad ICC profiles need these substitute types here, but it will still crash in readRaster // TODO: Merge with above?
srcCs = null; srcCs = null;
imageTypes = Arrays.asList( imageTypes = Arrays.asList(
ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR), ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR),
@ -352,9 +352,9 @@ public class JPEGImageReader extends ImageReaderBase {
if (startOfFrame.componentsInFrame != replacement.getNumComponents()) { if (startOfFrame.componentsInFrame != replacement.getNumComponents()) {
if (startOfFrame.componentsInFrame < 4 && transform == AdobeDCT.YCCK) { if (startOfFrame.componentsInFrame < 4 && transform == AdobeDCT.YCCK) {
processWarningOccurred(String.format( processWarningOccurred(String.format(
"Invalid Adobe App14 marker. Indicates YCCK/CMYK data, but SOFn has %d color components. " + "Invalid Adobe App14 marker. Indicates YCCK/CMYK data, but SOF%d has %d color components. " +
"Ignoring Adobe App14 marker, assuming YCC/RGB data.", "Ignoring Adobe App14 marker, assuming YCC/RGB data.",
startOfFrame.componentsInFrame startOfFrame.marker & 0xf, startOfFrame.componentsInFrame
)); ));
transform = AdobeDCT.YCC; transform = AdobeDCT.YCC;
} }
@ -362,9 +362,9 @@ public class JPEGImageReader extends ImageReaderBase {
// If ICC profile number of components and startOfFrame does not match, ignore ICC profile // If ICC profile number of components and startOfFrame does not match, ignore ICC profile
processWarningOccurred(String.format( processWarningOccurred(String.format(
"Embedded ICC color profile is incompatible with image data. " + "Embedded ICC color profile is incompatible with image data. " +
"Profile indicates %d components, but SOFn has %d color components. " + "Profile indicates %d components, but SOF%d has %d color components. " +
"Ignoring ICC profile, assuming YCC/RGB data.", "Ignoring ICC profile, assuming YCC/RGB data.",
replacement.getNumComponents(), startOfFrame.componentsInFrame replacement.getNumComponents(), startOfFrame.marker & 0xf, startOfFrame.componentsInFrame
)); ));
srcCs = null; srcCs = null;
} }
@ -648,10 +648,10 @@ public class JPEGImageReader extends ImageReaderBase {
private SOF getSOF() throws IOException { private SOF getSOF() throws IOException {
for (JPEGSegment segment : segments) { for (JPEGSegment segment : segments) {
if (JPEG.SOF0 <= segment.marker() && segment.marker() <= JPEG.SOF3 || if (JPEG.SOF0 >= segment.marker() && segment.marker() <= JPEG.SOF3 ||
JPEG.SOF5 <= segment.marker() && segment.marker() <= JPEG.SOF7 || JPEG.SOF5 >= segment.marker() && segment.marker() <= JPEG.SOF7 ||
JPEG.SOF9 <= segment.marker() && segment.marker() <= JPEG.SOF11 || JPEG.SOF9 >= segment.marker() && segment.marker() <= JPEG.SOF11 ||
JPEG.SOF13 <= segment.marker() && segment.marker() <= JPEG.SOF15) { JPEG.SOF13 >= segment.marker() && segment.marker() <= JPEG.SOF15) {
DataInputStream data = new DataInputStream(segment.data()); DataInputStream data = new DataInputStream(segment.data());
@ -1137,11 +1137,6 @@ public class JPEGImageReader extends ImageReaderBase {
processThumbnailStarted(imageIndex, thumbnailIndex); processThumbnailStarted(imageIndex, thumbnailIndex);
} }
@Override
public void imageComplete(ImageWriter source) {
processImageComplete();
}
public void passStarted(ImageReader source, BufferedImage theImage, int pass, int minPass, int maxPass, int minX, int minY, int periodX, int periodY, int[] bands) { public void passStarted(ImageReader source, BufferedImage theImage, int pass, int minPass, int maxPass, int minX, int minY, int periodX, int periodY, int[] bands) {
processPassStarted(theImage, pass, minPass, maxPass, minX, minY, periodX, periodY, bands); processPassStarted(theImage, pass, minPass, maxPass, minX, minY, periodX, periodY, bands);
} }
@ -1211,8 +1206,8 @@ public class JPEGImageReader extends ImageReaderBase {
@Override @Override
public String toString() { public String toString() {
return String.format( return String.format(
"SOF[marker: %04x, preciscion: %d, lines: %d, samples/line: %d, components: %s]", "SOF%d[%04x, precision: %d, lines: %d, samples/line: %d, components: %s]",
marker, samplePrecision, lines, samplesPerLine, Arrays.toString(components) marker & 0xf, marker, samplePrecision, lines, samplesPerLine, Arrays.toString(components)
); );
} }
} }