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

Merge pull request #34 from OpenVIVO/develop

Browse source 
Suppress dependency that causes OpenJDK problem
This commit is contained in:
grahamtriggs 2016-03-25 14:35:35 +00:00
commit 4f9fe39ca3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
View file

@ -87,7 +87,7 @@ public class JaiImageProcessor implements ImageProcessor {
try { try {
RenderedOp mainImage = loadImage(mainImageStream); RenderedOp mainImage = loadImage(mainImageStream);
BufferedImage bufferedImage = new BufferedImage(mainImage.getWidth(), mainImage.getHeight(), BufferedImage.TYPE_INT_RGB); BufferedImage bufferedImage = new BufferedImage(mainImage.getWidth(), mainImage.getHeight(), BufferedImage.TYPE_3BYTE_BGR); // BufferedImage.TYPE_INT_RGB
new ColorConvertOp(null).filter(mainImage.getAsBufferedImage(), bufferedImage); new ColorConvertOp(null).filter(mainImage.getAsBufferedImage(), bufferedImage);
log.debug("initial image: " + imageSize(bufferedImage)); log.debug("initial image: " + imageSize(bufferedImage));

6
dependencies/pom.xml vendored
View file

@ -126,6 +126,12 @@
<groupId>net.sf.jga</groupId> <groupId>net.sf.jga</groupId>
<artifactId>jga</artifactId> <artifactId>jga</artifactId>
<version>0.8.3</version> <version>0.8.3</version>
<exclusions>
<exclusion>
<groupId>jre</groupId>
<artifactId>javaws</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>