From 63b5ae999496dbd011c25db1365935c2afd17d46 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Thu, 10 Mar 2011 16:58:26 +0100 Subject: [PATCH] Removed debug output accidentally committed. Fixed a test. --- .../imageio/metadata/jpeg/JPEGSegmentUtil.java | 6 +++--- .../imageio/metadata/jpeg/JPEGSegmentTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java index cab3268c..d5e2d09b 100644 --- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java +++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java @@ -96,9 +96,9 @@ public final class JPEGSegmentUtil { JPEGSegment segment; try { -// while (!isImageDone(segment = readSegment(stream, segmentIdentifiers))) { - while (!isImageDone(segment = readSegment(stream, ALL_SEGMENTS))) { - System.err.println("segment: " + segment); + while (!isImageDone(segment = readSegment(stream, segmentIdentifiers))) { +// while (!isImageDone(segment = readSegment(stream, ALL_SEGMENTS))) { +// System.err.println("segment: " + segment); if (isRequested(segment, segmentIdentifiers)) { if (segments == Collections.EMPTY_LIST) { diff --git a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentTest.java b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentTest.java index 26c16bce..0f0e76fa 100644 --- a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentTest.java +++ b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentTest.java @@ -73,8 +73,8 @@ public class JPEGSegmentTest extends ObjectAbstractTestCase { @Override protected Object makeObject() { - byte[] bytes = new byte[14]; - System.arraycopy("JFIF".getBytes(Charset.forName("ascii")), 0, bytes, 0, 4); - return new JPEGSegment(0xFFE0, bytes); + byte[] bytes = new byte[11]; + System.arraycopy("Exif".getBytes(Charset.forName("ascii")), 0, bytes, 0, 4); + return new JPEGSegment(0xFFE1, bytes); } }