litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove JAI dependencies from ImageIO Image Processor

Browse source
This commit is contained in:
Graham Triggs 2016-12-18 19:01:15 +00:00
parent 05c4c6ce84
commit 45eef7e9f7
1 changed files with 6 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
View file

@ -2,7 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.imageprocessor.imageio; package edu.cornell.mannlib.vitro.webapp.imageprocessor.imageio;
import com.sun.media.jai.codec.MemoryCacheSeekableStream;
import edu.cornell.mannlib.vitro.webapp.modules.Application; import edu.cornell.mannlib.vitro.webapp.modules.Application;
import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus; import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor; import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
@ -10,11 +9,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.media.jai.JAI; import javax.imageio.stream.ImageInputStream;
import javax.media.jai.RenderedOp; import javax.imageio.stream.MemoryCacheImageInputStream;
import javax.media.jai.operator.BandSelectDescriptor;
import javax.media.jai.operator.StreamDescriptor;
import javax.media.jai.util.ImagingListener;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp; import java.awt.image.AffineTransformOp;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -55,8 +51,8 @@ public class IIOImageProcessor implements ImageProcessor {
*/ */
@Override @Override
public void startup(Application application, ComponentStartupStatus ss) { public void startup(Application application, ComponentStartupStatus ss) {
JAI.getDefaultInstance().setImagingListener( // JAI.getDefaultInstance().setImagingListener(
new NonNoisyImagingListener()); // new NonNoisyImagingListener());
} }
@Override @Override
@ -66,7 +62,7 @@ public class IIOImageProcessor implements ImageProcessor {
@Override @Override
public Dimensions getDimensions(InputStream imageStream) throws ImageProcessorException, IOException { public Dimensions getDimensions(InputStream imageStream) throws ImageProcessorException, IOException {
MemoryCacheSeekableStream stream = new MemoryCacheSeekableStream(imageStream); ImageInputStream stream = new MemoryCacheImageInputStream(imageStream);
BufferedImage image = ImageIO.read(stream); BufferedImage image = ImageIO.read(stream);
return new Dimensions(image.getWidth(), image.getHeight()); return new Dimensions(image.getWidth(), image.getHeight());
} }
@ -80,7 +76,7 @@ public class IIOImageProcessor implements ImageProcessor {
CropRectangle crop, Dimensions limits) CropRectangle crop, Dimensions limits)
throws ImageProcessorException, IOException { throws ImageProcessorException, IOException {
try { try {
MemoryCacheSeekableStream stream = new MemoryCacheSeekableStream(mainImageStream); ImageInputStream stream = new MemoryCacheImageInputStream(mainImageStream);
BufferedImage mainImage = ImageIO.read(stream); BufferedImage mainImage = ImageIO.read(stream);
BufferedImage bufferedImage = new BufferedImage(mainImage.getWidth(), mainImage.getHeight(), BufferedImage.TYPE_3BYTE_BGR); // BufferedImage.TYPE_INT_RGB BufferedImage bufferedImage = new BufferedImage(mainImage.getWidth(), mainImage.getHeight(), BufferedImage.TYPE_3BYTE_BGR); // BufferedImage.TYPE_INT_RGB
@ -176,33 +172,4 @@ public class IIOImageProcessor implements ImageProcessor {
ImageIO.write(image, "JPG", bytes); ImageIO.write(image, "JPG", bytes);
return bytes.toByteArray(); return bytes.toByteArray();
} }
/**
* This ImagingListener means that Java Advanced Imaging won't dump an
* exception log to System.out. It writes to the log, instead.
*
* Further, since the lack of native accelerator classes isn't an error, it
* is written as a simple log message.
*/
static class NonNoisyImagingListener implements ImagingListener {
@Override
public boolean errorOccurred(String message, Throwable thrown,
Object where, boolean isRetryable) throws RuntimeException {
if (thrown instanceof RuntimeException) {
throw (RuntimeException) thrown;
}
if ((thrown instanceof NoClassDefFoundError)
&& (thrown.getMessage()
.contains("com/sun/medialib/mlib/Image"))) {
log.info("Java Advanced Imaging: Could not find mediaLib "
+ "accelerator wrapper classes. "
+ "Continuing in pure Java mode.");
return false;
}
log.error(thrown, thrown);
return false;
}
}
} }