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

Minor clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2015-03-12 15:35:51 +01:00
parent 02a4277413
commit 217f4dc371
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEG.java
View File

@ -68,13 +68,13 @@ public interface JPEG {
int APP15 = 0xFFEF; int APP15 = 0xFFEF;
// Start of Frame segment markers (SOFn). // Start of Frame segment markers (SOFn).
/** SOF0: Baseline DCT, Huffman encoded. */ /** SOF0: Baseline DCT, Huffman coding. */
int SOF0 = 0xFFC0; int SOF0 = 0xFFC0;
/** SOF0: Extended DCT, Huffman encoded. */ /** SOF0: Extended DCT, Huffman coding. */
int SOF1 = 0xFFC1; int SOF1 = 0xFFC1;
/** SOF2: Progressive DCT, Huffman encoded. */ /** SOF2: Progressive DCT, Huffman coding. */
int SOF2 = 0xFFC2; int SOF2 = 0xFFC2;
/** SOF3: Lossless sequential, Huffman encoded. */ /** SOF3: Lossless sequential, Huffman coding. */
int SOF3 = 0xFFC3; int SOF3 = 0xFFC3;
/** SOF5: Sequential DCT, differential Huffman coding. */ /** SOF5: Sequential DCT, differential Huffman coding. */
int SOF5 = 0xFFC5; int SOF5 = 0xFFC5;
@ -86,7 +86,7 @@ public interface JPEG {
int SOF9 = 0xFFC9; int SOF9 = 0xFFC9;
/** SOF10: Progressive DCT, arithmetic coding. */ /** SOF10: Progressive DCT, arithmetic coding. */
int SOF10 = 0xFFCA; int SOF10 = 0xFFCA;
/** SOF11: Lossless sequential, arithmetic encoded. */ /** SOF11: Lossless sequential, arithmetic coding. */
int SOF11 = 0xFFCB; int SOF11 = 0xFFCB;
/** SOF13: Sequential DCT, differential arithmetic coding. */ /** SOF13: Sequential DCT, differential arithmetic coding. */
int SOF13 = 0xFFCD; int SOF13 = 0xFFCD;

4
imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGQuality.java
View File

@ -232,7 +232,7 @@ public final class JPEGQuality {
throw new IIOException("Duplicate DQT table index: " + num); throw new IIOException("Duplicate DQT table index: " + num);
} }
if (bits > 1) { if (bits < 0 || bits > 1) {
throw new IIOException("Bad DQT bit info: " + bits); throw new IIOException("Bad DQT bit info: " + bits);
} }
@ -247,11 +247,13 @@ public final class JPEGQuality {
for (int j = 0, qtDataLength = qtData.length; j < qtDataLength; j++) { for (int j = 0, qtDataLength = qtData.length; j < qtDataLength; j++) {
tables[num][j] = (short) (qtData[j] & 0xff); tables[num][j] = (short) (qtData[j] & 0xff);
} }
break; break;
case 1: case 1:
for (int j = 0, qtDataLength = qtData.length; j < qtDataLength; j += 2) { for (int j = 0, qtDataLength = qtData.length; j < qtDataLength; j += 2) {
tables[num][j / 2] = (short) ((qtData[j] & 0xff) << 8 | (qtData[j + 1] & 0xff)); tables[num][j / 2] = (short) ((qtData[j] & 0xff) << 8 | (qtData[j + 1] & 0xff));
} }
break; break;
} }
} }