Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 12:35:29 -04:00
Code Issues Projects Releases Wiki Activity

Fix flaky old test.

Browse Source
This commit is contained in:
Harald Kuhr 2023-04-04 16:06:42 +02:00
parent 76a35331b0
commit aa2e8e5d7e
2 changed files with 96 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java
View File

@ -91,21 +91,21 @@ public final class BufferedImageFactory {
/** /**
* Creates a {@code BufferedImageFactory}. * Creates a {@code BufferedImageFactory}.
* @param pSource the source image * @param source the source image
* @throws IllegalArgumentException if {@code pSource == null} * @throws IllegalArgumentException if {@code source == null}
*/ */
public BufferedImageFactory(final Image pSource) { public BufferedImageFactory(final Image source) {
this(pSource != null ? pSource.getSource() : null); this(source != null ? source.getSource() : null);
} }
/** /**
* Creates a {@code BufferedImageFactory}. * Creates a {@code BufferedImageFactory}.
* @param pSource the source image producer * @param source the source image producer
* @throws IllegalArgumentException if {@code pSource == null} * @throws IllegalArgumentException if {@code source == null}
*/ */
public BufferedImageFactory(final ImageProducer pSource) { public BufferedImageFactory(final ImageProducer source) {
Validate.notNull(pSource, "source"); Validate.notNull(source, "source");
producer = pSource; producer = source;
} }
/** /**
@ -155,44 +155,44 @@ public final class BufferedImageFactory {
/** /**
* Sets the source region (AOI) for the new image. * Sets the source region (AOI) for the new image.
* *
* @param pRegion the source region * @param region the source region
*/ */
public void setSourceRegion(final Rectangle pRegion) { public void setSourceRegion(final Rectangle region) {
// Re-fetch everything, if region changed // Re-fetch everything, if region changed
if (x != pRegion.x || y != pRegion.y || width != pRegion.width || height != pRegion.height) { if (x != region.x || y != region.y || width != region.width || height != region.height) {
dispose(); dispose();
} }
x = pRegion.x; x = region.x;
y = pRegion.y; y = region.y;
width = pRegion.width; width = region.width;
height = pRegion.height; height = region.height;
} }
/** /**
* Sets the source subsampling for the new image. * Sets the source subsampling for the new image.
* *
* @param pXSub horizontal subsampling factor * @param xSubsampling horizontal subsampling factor
* @param pYSub vertical subsampling factor * @param ySubsampling vertical subsampling factor
*/ */
public void setSourceSubsampling(int pXSub, int pYSub) { public void setSourceSubsampling(int xSubsampling, int ySubsampling) {
// Re-fetch everything, if subsampling changed // Re-fetch everything, if subsampling changed
if (xSub != pXSub || ySub != pYSub) { if (xSub != xSubsampling || ySub != ySubsampling) {
dispose(); dispose();
} }
if (pXSub > 1) { if (xSubsampling > 1) {
xSub = pXSub; xSub = xSubsampling;
} }
if (pYSub > 1) { if (ySubsampling > 1) {
ySub = pYSub; ySub = ySubsampling;
} }
} }
private synchronized void doFetch(boolean pColorModelOnly) throws ImageConversionException { private synchronized void doFetch(final boolean colorModelOnly) throws ImageConversionException {
if (!fetching && (!pColorModelOnly && buffered == null || buffered == null && sourceColorModel == null)) { if (!fetching && (!colorModelOnly && buffered == null || buffered == null && sourceColorModel == null)) {
// NOTE: Subsampling is only applied if extracting full image // NOTE: Subsampling is only applied if extracting full image
if (!pColorModelOnly && (xSub > 1 || ySub > 1)) { if (!colorModelOnly && (xSub > 1 || ySub > 1)) {
// If only sampling a region, the region must be scaled too // If only sampling a region, the region must be scaled too
if (width > 0 && height > 0) { if (width > 0 && height > 0) {
width = (width + xSub - 1) / xSub; width = (width + xSub - 1) / xSub;
@ -207,7 +207,7 @@ public final class BufferedImageFactory {
// Start fetching // Start fetching
fetching = true; fetching = true;
readColorModelOnly = pColorModelOnly; readColorModelOnly = colorModelOnly;
producer.startProduction(consumer); // Note: If single-thread (synchronous), this call will block producer.startProduction(consumer); // Note: If single-thread (synchronous), this call will block
@ -225,7 +225,7 @@ public final class BufferedImageFactory {
throw new ImageConversionException("Image conversion failed: " + consumerException.getMessage(), consumerException); throw new ImageConversionException("Image conversion failed: " + consumerException.getMessage(), consumerException);
} }
if (pColorModelOnly) { if (colorModelOnly) {
createColorModel(); createColorModel();
} }
else { else {
@ -280,27 +280,27 @@ public final class BufferedImageFactory {
/** /**
* Adds a progress listener to this factory. * Adds a progress listener to this factory.
* *
* @param pListener the progress listener * @param listener the progress listener
*/ */
public void addProgressListener(ProgressListener pListener) { public void addProgressListener(ProgressListener listener) {
if (pListener == null) { if (listener == null) {
return; return;
} }
if (listeners == null) { if (listeners == null) {
listeners = new CopyOnWriteArrayList<ProgressListener>(); listeners = new CopyOnWriteArrayList<>();
} }
listeners.add(pListener); listeners.add(listener);
} }
/** /**
* Removes a progress listener from this factory. * Removes a progress listener from this factory.
* *
* @param pListener the progress listener * @param listener the progress listener
*/ */
public void removeProgressListener(ProgressListener pListener) { public void removeProgressListener(ProgressListener listener) {
if (pListener == null) { if (listener == null) {
return; return;
} }
@ -308,7 +308,7 @@ public final class BufferedImageFactory {
return; return;
} }
listeners.remove(pListener); listeners.remove(listener);
} }
/** /**
@ -331,14 +331,14 @@ public final class BufferedImageFactory {
* short value = (short) (intValue & 0x0000ffff); * short value = (short) (intValue & 0x0000ffff);
* }</blockquote> * }</blockquote>
* *
* @param pPixels the pixel data to convert * @param inputPixels the pixel data to convert
* @return an array of {@code short}s, same lenght as {@code pPixels} * @return an array of {@code short}s, same length as {@code inputPixels}
*/ */
private static short[] toShortPixels(int[] pPixels) { private static short[] toShortPixels(int[] inputPixels) {
short[] pixels = new short[pPixels.length]; short[] pixels = new short[inputPixels.length];
for (int i = 0; i < pixels.length; i++) { for (int i = 0; i < pixels.length; i++) {
pixels[i] = (short) (pPixels[i] & 0xffff); pixels[i] = (short) (inputPixels[i] & 0xffff);
} }
return pixels; return pixels;
@ -358,10 +358,10 @@ public final class BufferedImageFactory {
* Invoked by the {@code BufferedImageFactory} to report progress in * Invoked by the {@code BufferedImageFactory} to report progress in
* the image decoding. * the image decoding.
* *
* @param pFactory the factory reporting the progress * @param factory the factory reporting the progress
* @param pPercentage the percentage of progress * @param percentage the percentage of progress
*/ */
void progress(BufferedImageFactory pFactory, float pPercentage); void progress(BufferedImageFactory factory, float percentage);
} }
private class Consumer implements ImageConsumer { private class Consumer implements ImageConsumer {
@ -446,18 +446,18 @@ public final class BufferedImageFactory {
processProgress(pY + pHeight); processProgress(pY + pHeight);
} }
public void setPixels(int pX, int pY, int pWidth, int pHeight, ColorModel pModel, short[] pPixels, int pOffset, int pScanSize) { public void setPixels(int x, int y, int width, int height, ColorModel colorModel, short[] pixels, int offset, int scanSize) {
setPixelsImpl(pX, pY, pWidth, pHeight, pModel, pPixels, pOffset, pScanSize); setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
} }
private void setColorModelOnce(final ColorModel pModel) { private void setColorModelOnce(final ColorModel colorModel) {
// NOTE: There seems to be a "bug" in AreaAveragingScaleFilter, as it // NOTE: There seems to be a "bug" in AreaAveragingScaleFilter, as it
// first passes the original color model through in setColorModel, then // first passes the original color model through in setColorModel, then
// later replaces it with the default RGB in the first setPixels call // later replaces it with the default RGB in the first setPixels call
// (this is probably allowed according to the spec, but it's a waste of time and space). // (this is probably allowed according to the spec, but it's a waste of time and space).
if (sourceColorModel != pModel) { if (sourceColorModel != colorModel) {
if (/*sourceColorModel == null ||*/ sourcePixels == null) { if (/*sourceColorModel == null ||*/ sourcePixels == null) {
sourceColorModel = pModel; sourceColorModel = colorModel;
} }
else { else {
throw new IllegalStateException("Change of ColorModel after pixel delivery not supported"); throw new IllegalStateException("Change of ColorModel after pixel delivery not supported");
@ -470,14 +470,15 @@ public final class BufferedImageFactory {
} }
} }
public void imageComplete(int pStatus) { @Override
public void imageComplete(int status) {
fetching = false; fetching = false;
if (producer != null) { if (producer != null) {
producer.removeConsumer(this); producer.removeConsumer(this);
} }
switch (pStatus) { switch (status) {
case ImageConsumer.IMAGEERROR: case ImageConsumer.IMAGEERROR:
consumerException = new ImageConversionException("ImageConsumer.IMAGEERROR"); consumerException = new ImageConversionException("ImageConsumer.IMAGEERROR");
break; break;
@ -488,16 +489,18 @@ public final class BufferedImageFactory {
} }
} }
public void setColorModel(ColorModel pModel) { @Override
setColorModelOnce(pModel); public void setColorModel(ColorModel colorModel) {
setColorModelOnce(colorModel);
} }
public void setDimensions(int pWidth, int pHeight) { @Override
public void setDimensions(int w, int h) {
if (width < 0) { if (width < 0) {
width = pWidth - x; width = w - x;
} }
if (height < 0) { if (height < 0) {
height = pHeight - y; height = h - y;
} }
// Hmm.. Special case, but is it a good idea? // Hmm.. Special case, but is it a good idea?
@ -506,27 +509,31 @@ public final class BufferedImageFactory {
} }
} }
public void setHints(int pHintflags) { @Override
public void setHints(int hintFlags) {
// ignore // ignore
} }
public void setPixels(int pX, int pY, int pWidth, int pHeight, ColorModel pModel, byte[] pPixels, int pOffset, int pScanSize) { @Override
setPixelsImpl(pX, pY, pWidth, pHeight, pModel, pPixels, pOffset, pScanSize); public void setPixels(int x, int y, int width, int height, ColorModel colorModel, byte[] pixels, int offset, int scanSize) {
setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
} }
public void setPixels(int pX, int pY, int pWeigth, int pHeight, ColorModel pModel, int[] pPixels, int pOffset, int pScanSize) { @Override
if (pModel.getTransferType() == DataBuffer.TYPE_USHORT) { public void setPixels(int x, int y, int width, int height, ColorModel colorModel, int[] pixels, int offset, int scanSize) {
if (colorModel.getTransferType() == DataBuffer.TYPE_USHORT) {
// NOTE: Workaround for limitation in ImageConsumer API // NOTE: Workaround for limitation in ImageConsumer API
// Convert int[] to short[], to be compatible with the ColorModel // Convert int[] to short[], to be compatible with the ColorModel
setPixelsImpl(pX, pY, pWeigth, pHeight, pModel, toShortPixels(pPixels), pOffset, pScanSize); setPixelsImpl(x, y, width, height, colorModel, toShortPixels(pixels), offset, scanSize);
} }
else { else {
setPixelsImpl(pX, pY, pWeigth, pHeight, pModel, pPixels, pOffset, pScanSize); setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
} }
} }
public void setProperties(Hashtable pProperties) { @Override
sourceProperties = pProperties; public void setProperties(Hashtable properties) {
sourceProperties = properties;
} }
} }

39
common/common-image/src/test/java/com/twelvemonkeys/image/BufferedImageFactoryTest.java
View File

@ -34,14 +34,14 @@ import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.awt.*; import java.awt.*;
import java.awt.color.ColorSpace; import java.awt.color.*;
import java.awt.image.BufferedImage; import java.awt.image.*;
import java.awt.image.ColorModel;
import java.awt.image.ImageProducer;
import java.awt.image.IndexColorModel;
import java.net.URL; import java.net.URL;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/** /**
* BufferedImageFactoryTestCase * BufferedImageFactoryTestCase
@ -89,12 +89,17 @@ public class BufferedImageFactoryTest {
// This is a little random, and it would be nicer if we could throw an IllegalArgumentException on create. // This is a little random, and it would be nicer if we could throw an IllegalArgumentException on create.
// Unfortunately, the API doesn't allow this... // Unfortunately, the API doesn't allow this...
@Test(timeout = 1000, expected = ImageConversionException.class) @Test(timeout = 1000)
public void testGetBufferedImageErrorSourceURL() { public void testGetBufferedImageErrorSourceURL() {
Image source = Toolkit.getDefaultToolkit().createImage(getClass().getResource("/META-INF/MANIFEST.MF")); Image source = Toolkit.getDefaultToolkit().createImage(getClass().getResource("/META-INF/MANIFEST.MF"));
BufferedImageFactory factory = new BufferedImageFactory(source); try {
factory.getBufferedImage(); BufferedImageFactory factory = new BufferedImageFactory(source);
assertNull(factory.getBufferedImage()); // Should normally not be reached
}
catch (ImageConversionException ignore) {
// This exception is allowed and *expected*, however this behavior is flaky in some environments...
}
} }
@Test @Test
@ -260,9 +265,9 @@ public class BufferedImageFactoryTest {
// Listener should abort ASAP // Listener should abort ASAP
factory.addProgressListener(new BufferedImageFactory.ProgressListener() { factory.addProgressListener(new BufferedImageFactory.ProgressListener() {
public void progress(BufferedImageFactory pFactory, float pPercentage) { public void progress(BufferedImageFactory factory, float percentage) {
if (pPercentage > 5) { if (percentage > 5) {
pFactory.abort(); factory.abort();
} }
} }
}); });
@ -343,7 +348,7 @@ public class BufferedImageFactoryTest {
VerifyingListener listener = new VerifyingListener(factory); VerifyingListener listener = new VerifyingListener(factory);
factory.addProgressListener(listener); factory.addProgressListener(listener);
factory.removeProgressListener(new BufferedImageFactory.ProgressListener() { factory.removeProgressListener(new BufferedImageFactory.ProgressListener() {
public void progress(BufferedImageFactory pFactory, float pPercentage) { public void progress(BufferedImageFactory factory, float percentage) {
} }
}); });
factory.getBufferedImage(); factory.getBufferedImage();
@ -380,11 +385,11 @@ public class BufferedImageFactoryTest {
this.factory = factory; this.factory = factory;
} }
public void progress(BufferedImageFactory pFactory, float pPercentage) { public void progress(BufferedImageFactory factory, float percentage) {
assertEquals(factory, pFactory); assertEquals(this.factory, factory);
assertTrue(pPercentage >= progress && pPercentage <= 100f); assertTrue(percentage >= progress && percentage <= 100f);
progress = pPercentage; progress = percentage;
} }