Fix JPEG tests

This commit is contained in:
Harald Kuhr 2020-07-10 22:26:12 +02:00
parent 5cc201b46d
commit 330a0414f0
2 changed files with 3 additions and 3 deletions

View File

@ -718,6 +718,7 @@ public final class JPEGImageReader extends ImageReaderBase {
} }
if (imageIndex == currentStreamIndex) { if (imageIndex == currentStreamIndex) {
initHeader();
return; return;
} }

View File

@ -32,7 +32,6 @@ package com.twelvemonkeys.imageio.plugins.jpeg;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import com.twelvemonkeys.lang.StringUtil; import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.xml.XMLSerializer;
import org.hamcrest.core.IsInstanceOf; import org.hamcrest.core.IsInstanceOf;
import org.junit.Test; import org.junit.Test;
import org.mockito.internal.matchers.GreaterThan; import org.mockito.internal.matchers.GreaterThan;
@ -1383,8 +1382,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
// Assume that the aspect ratio is 1 if both x/y density is 0. // Assume that the aspect ratio is 1 if both x/y density is 0.
IIOMetadataNode tree = (IIOMetadataNode) imageMetadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName); IIOMetadataNode tree = (IIOMetadataNode) imageMetadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName);
new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false); // new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false);
new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(tree, false); // new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(tree, false);
NodeList dimensions = tree.getElementsByTagName("Dimension"); NodeList dimensions = tree.getElementsByTagName("Dimension");
assertEquals(1, dimensions.getLength()); assertEquals(1, dimensions.getLength());
assertEquals("PixelAspectRatio", dimensions.item(0).getFirstChild().getNodeName()); assertEquals("PixelAspectRatio", dimensions.item(0).getFirstChild().getNodeName());