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

Various fixes for metadata parsing.

Browse Source 
- Added more TIFF/EXIF tags
- Clean-up of JPEG segment reading
- Better toString in general and XMP specific
This commit is contained in:
Harald Kuhr
2011-12-12 10:42:40 +01:00
parent 2a282cf8e4
commit 5d3fb34e49
9 changed files with 238 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentTest.java
View File

@@ -48,7 +48,7 @@ public class JPEGSegmentTest extends ObjectAbstractTestCase {
byte[] bytes = new byte[14];
System.arraycopy("JFIF".getBytes(Charset.forName("ascii")), 0, bytes, 0, 4);
JPEGSegment segment = new JPEGSegment(0xFFE0, bytes);
JPEGSegment segment = new JPEGSegment(0xFFE0, bytes, 16);
assertEquals(0xFFE0, segment.marker());
assertEquals("JFIF", segment.identifier());
@@ -60,7 +60,7 @@ public class JPEGSegmentTest extends ObjectAbstractTestCase {
public void testToStringAppSegment() {
byte[] bytes = new byte[14];
System.arraycopy("JFIF".getBytes(Charset.forName("ascii")), 0, bytes, 0, 4);
JPEGSegment segment = new JPEGSegment(0xFFE0, bytes);
JPEGSegment segment = new JPEGSegment(0xFFE0, bytes, 16);
assertEquals("JPEGSegment[ffe0/JFIF size: 16]", segment.toString());
}
@@ -68,7 +68,7 @@ public class JPEGSegmentTest extends ObjectAbstractTestCase {
@Test
public void testToStringNonAppSegment() {
byte[] bytes = new byte[40];
JPEGSegment segment = new JPEGSegment(0xFFC4, bytes);
JPEGSegment segment = new JPEGSegment(0xFFC4, bytes, 42);
assertEquals("JPEGSegment[ffc4 size: 42]", segment.toString());
}
@@ -77,6 +77,6 @@ public class JPEGSegmentTest extends ObjectAbstractTestCase {
protected Object makeObject() {
byte[] bytes = new byte[11];
System.arraycopy("Exif".getBytes(Charset.forName("ascii")), 0, bytes, 0, 4);
return new JPEGSegment(0xFFE1, bytes);
return new JPEGSegment(0xFFE1, bytes, 16);
}
}