Skip to content

Commit

Permalink
add test for variable-density images
Browse files Browse the repository at this point in the history
  • Loading branch information
@mstr2
mstr2 committed Oct 6, 2024
1 parent b92ce0f commit 4f6b7af
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 17 deletions.
13 changes: 9 additions & 4 deletions modules/javafx.graphics/src/main/java/com/sun/javafx/iio/javax/XImageLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,12 @@ public XImageLoader(ImageReader reader, ImageInputStream stream) throws IOExcept
this.stream = stream;
this.description = new ImageDescriptor(
reader.getFormatName(), new String[0], new ImageFormatDescription.Signature[0],
Arrays.stream(reader.getOriginatingProvider().getMIMETypes())
.map(type -> type.substring(type.indexOf('/')))
.toArray(String[]::new));
reader.getOriginatingProvider() == null ? new String[0] :
Arrays.stream(reader.getOriginatingProvider().getMIMETypes())
.map(type -> type.substring(type.indexOf('/')))
.toArray(String[]::new));

reader.setInput(stream);
}

@Override
Expand All @@ -79,7 +82,9 @@ public void dispose() {
reader.dispose();

try {
stream.close();
if (stream != null) {
stream.close();
}
} catch (IOException ignored) {
}
}
Expand Down
2 changes: 0 additions & 2 deletions modules/javafx.graphics/src/main/java/com/sun/javafx/iio/javax/XImageLoaderFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ public ImageLoader createImageLoader(InputStream input) throws IOException {
return null;
}

reader.setInput(stream);

// XImageLoader is responsible for closing the ImageInputStream after
// it has finished reading from it.
return new XImageLoader(reader, stream);
Expand Down
104 changes: 93 additions & 11 deletions modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/javax/XImageLoaderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,28 @@
import com.sun.javafx.iio.ImageLoadListener;
import com.sun.javafx.iio.ImageLoader;
import com.sun.javafx.iio.ImageMetadata;
import com.sun.javafx.iio.ImageStorage;
import com.sun.javafx.iio.ImageStorage.ImageType;
import com.sun.javafx.iio.javax.XImageLoader;
import com.sun.javafx.iio.javax.XImageLoaderFactory;
import com.sun.prism.Image;
import com.sun.prism.PixelFormat;
import org.junit.jupiter.api.Test;
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.stream.ImageInputStream;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import com.sun.prism.PixelFormat;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;

import static org.junit.jupiter.api.Assertions.*;

Expand All @@ -67,7 +75,7 @@ private void assertImageContent(Image image) {
}

@Test
void testLoadImageBGR() throws Exception {
void loadImageBGR() throws Exception {
try (InputStream stream = getClass().getResourceAsStream("/test/com/sun/javafx/iio/checker.bmp")) {
ImageLoader loader = XImageLoaderFactory.getInstance().createImageLoader(stream);
ImageFrame frame = loader.load(0, -1, -1, true, false, 1, 1);
Expand All @@ -76,7 +84,7 @@ void testLoadImageBGR() throws Exception {
assertEquals(12, frame.getWidth());
assertEquals(12, frame.getHeight());
assertEquals(1, frame.getPixelScale());
assertEquals(ImageStorage.ImageType.BGR, frame.getImageType());
assertEquals(ImageType.BGR, frame.getImageType());

assertEquals(12, image.getWidth());
assertEquals(12, image.getHeight());
Expand All @@ -86,7 +94,7 @@ void testLoadImageBGR() throws Exception {
}

@Test
void testLoadImageABGR() throws Exception {
void loadImageABGR() throws Exception {
try (InputStream stream = getClass().getResourceAsStream("/test/com/sun/javafx/iio/checker.png")) {
ImageLoader loader = XImageLoaderFactory.getInstance().createImageLoader(stream);
ImageFrame frame = loader.load(0, -1, -1, true, false, 1, 1);
Expand All @@ -95,7 +103,7 @@ void testLoadImageABGR() throws Exception {
assertEquals(12, frame.getWidth());
assertEquals(12, frame.getHeight());
assertEquals(1, frame.getPixelScale());
assertEquals(ImageStorage.ImageType.ABGR, frame.getImageType());
assertEquals(ImageType.ABGR, frame.getImageType());

assertEquals(12, image.getWidth());
assertEquals(12, image.getHeight());
Expand All @@ -105,7 +113,7 @@ void testLoadImageABGR() throws Exception {
}

@Test
void testLoadImageABGR2x() throws Exception {
void loadImageABGR2x() throws Exception {
try (InputStream stream = getClass().getResourceAsStream("/test/com/sun/javafx/iio/[email protected]")) {
ImageLoader loader = XImageLoaderFactory.getInstance().createImageLoader(stream);
ImageFrame frame = loader.load(0, -1, -1, true, false, 1, 2);
Expand All @@ -114,7 +122,7 @@ void testLoadImageABGR2x() throws Exception {
assertEquals(24, frame.getWidth());
assertEquals(24, frame.getHeight());
assertEquals(2, frame.getPixelScale());
assertEquals(ImageStorage.ImageType.ABGR, frame.getImageType());
assertEquals(ImageType.ABGR, frame.getImageType());

assertEquals(24, image.getWidth());
assertEquals(24, image.getHeight());
Expand All @@ -123,8 +131,83 @@ void testLoadImageABGR2x() throws Exception {
}
}

enum AwtImageTypes {
TYPE_BYTE_GRAY(BufferedImage.TYPE_BYTE_GRAY, ImageType.GRAY),
TYPE_3BYTE_BGR(BufferedImage.TYPE_3BYTE_BGR, ImageType.BGR),
TYPE_4BYTE_ABGR(BufferedImage.TYPE_4BYTE_ABGR, ImageType.ABGR),
TYPE_4BYTE_ABGR_PRE(BufferedImage.TYPE_4BYTE_ABGR_PRE, ImageType.ABGR_PRE),
TYPE_INT_RGB(BufferedImage.TYPE_INT_RGB, ImageType.INT_RGB),
TYPE_INT_BGR(BufferedImage.TYPE_INT_BGR, ImageType.INT_BGR),
TYPE_INT_ARGB(BufferedImage.TYPE_INT_ARGB, ImageType.INT_ARGB),
TYPE_INT_ARGB_PRE(BufferedImage.TYPE_INT_ARGB_PRE, ImageType.INT_ARGB_PRE);

AwtImageTypes(int awtImageType, ImageType fxImageType) {
this.awtIimageType = awtImageType;
this.fxImageType = fxImageType;
}

final int awtIimageType;
final ImageType fxImageType;
}

@ParameterizedTest
@EnumSource(AwtImageTypes.class)
void loadVariableDensityImage(AwtImageTypes types) throws IOException {
class CustomImageReader extends ImageReader {
final int imageType;

protected CustomImageReader(int imageType) {
super(null);
this.imageType = imageType;
}

@Override public String getFormatName() { return "test"; }
@Override public int getNumImages(boolean allowSearch) { return 1; }
@Override public int getWidth(int imageIndex) { return 2; }
@Override public int getHeight(int imageIndex) { return 2; }
@Override public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) { return null; }
@Override public IIOMetadata getStreamMetadata() { return null; }
@Override public IIOMetadata getImageMetadata(int imageIndex) { return null; }

@Override
public ImageReadParam getDefaultReadParam() {
return new ImageReadParam() {{ canSetSourceRenderSize = true; }};
}

@Override
public BufferedImage read(int imageIndex, ImageReadParam param) {
int w = (int)param.getSourceRenderSize().getWidth();
int h = (int)param.getSourceRenderSize().getHeight();
return new BufferedImage(w, h, imageType);
}
}

var imageLoader = new XImageLoader(new CustomImageReader(types.awtIimageType), null);

// Load an image with screenPixelScale == 1
var imageFrame = imageLoader.load(0, -1, -1, false, false, 1, 1);
assertEquals(2, imageFrame.getWidth());
assertEquals(2, imageFrame.getHeight());
assertEquals(1, imageFrame.getPixelScale());
assertEquals(types.fxImageType, imageFrame.getImageType());

// Load an image with screenPixelScale == 1.5
imageFrame = imageLoader.load(0, -1, -1, false, false, 1.5f, 1);
assertEquals(3, imageFrame.getWidth());
assertEquals(3, imageFrame.getHeight());
assertEquals(1.5, imageFrame.getPixelScale());
assertEquals(types.fxImageType, imageFrame.getImageType());

// Load an image with screenPixelScale == 2
imageFrame = imageLoader.load(0, -1, -1, false, false, 2, 1);
assertEquals(4, imageFrame.getWidth());
assertEquals(4, imageFrame.getHeight());
assertEquals(2, imageFrame.getPixelScale());
assertEquals(types.fxImageType, imageFrame.getImageType());
}

@Test
void testAddAndRemoveListener() throws Exception {
void addAndRemoveListener() throws Exception {
try (InputStream stream = getClass().getResourceAsStream("/test/com/sun/javafx/iio/checker.png")) {
ImageReader pngReader = ImageIO.getImageReadersByFormatName("PNG").next();
ImageInputStream input = ImageIO.createImageInputStream(stream);
Expand Down Expand Up @@ -179,5 +262,4 @@ public void imageLoadProgress(ImageLoader loader, float percentageComplete) {
assertEquals(orderedProgress, progress);
}
}

}

0 comments on commit 4f6b7af

Please sign in to comment.