Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 12:05:29 -04:00
Code Issues Projects Releases Wiki Activity

#660: Attempt at making the comment parsing more Windows-friendly...

Browse Source 
(cherry picked from commit 60eab8170934aacee46a8ee33d65c1748939a184)
This commit is contained in:
Harald Kuhr 2022-02-08 11:19:38 +01:00
parent e9996f096f
commit 76a9ff1122
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMHeaderParser.java
View File

@ -30,8 +30,11 @@
package com.twelvemonkeys.imageio.plugins.pnm; package com.twelvemonkeys.imageio.plugins.pnm;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import javax.imageio.IIOException; import javax.imageio.IIOException;
import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.ImageInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -76,11 +79,11 @@ final class PNMHeaderParser extends HeaderParser {
tokenBuffer.delete(0, tokenBuffer.length()); tokenBuffer.delete(0, tokenBuffer.length());
while (tokenBuffer.length() < 16) { while (tokenBuffer.length() < 16) {
char read = (char) input.readByte(); byte read = input.readByte();
if (read == '#') { if (read == '#') {
// Read rest of the line as comment // Read rest of the line as comment
String comment = input.readLine(); String comment = readComment(input);
if (!comment.trim().isEmpty()) { if (!comment.trim().isEmpty()) {
comments.add(comment); comments.add(comment);
@ -88,13 +91,13 @@ final class PNMHeaderParser extends HeaderParser {
break; break;
} }
else if (Character.isWhitespace(read)) { else if (Character.isWhitespace((char) read)) {
if (tokenBuffer.length() > 0) { if (tokenBuffer.length() > 0) {
break; break;
} }
} }
else { else {
tokenBuffer.append(read); tokenBuffer.append((char) read);
} }
} }
@ -119,4 +122,23 @@ final class PNMHeaderParser extends HeaderParser {
return new PNMHeader(fileType, tupleType, width, height, tupleType.getSamplesPerPixel(), maxSample, comments); return new PNMHeader(fileType, tupleType, width, height, tupleType.getSamplesPerPixel(), maxSample, comments);
} }
private static String readComment(final ImageInputStream input) throws IOException {
ByteArrayOutputStream commentBuffer = new FastByteArrayOutputStream(128);
int read;
do {
switch (read = input.read()) {
case -1:
case '\n':
case '\r':
read = -1;
break;
default:
commentBuffer.write(read);
}
} while (read != -1);
return commentBuffer.toString("UTF8");
}
} }