From acf54541a5f490ecec6335b5152fe71898084d45 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Fri, 11 Mar 2016 15:15:47 +0000
Subject: [PATCH 1/2] [VIVO-1234] Use alternative colour space that should work
 better with OpenJDK

---
 .../vitro/webapp/imageprocessor/jai/JaiImageProcessor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
index 912630945..b5d4a7cae 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
@@ -87,7 +87,7 @@ public class JaiImageProcessor implements ImageProcessor {
 		try {
 			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);
 
 			log.debug("initial image: " + imageSize(bufferedImage));

From df7c74206a6071d6f74e289fc4a0dacd51516596 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Fri, 25 Mar 2016 14:34:38 +0000
Subject: [PATCH 2/2] [VIVO-1236] Remove dependency from compile that causes
 problems with OpenJDK

---
 dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index f142c8a22..1f10d9467 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -126,6 +126,12 @@
             <groupId>net.sf.jga</groupId>
             <artifactId>jga</artifactId>
             <version>0.8.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jre</groupId>
+                    <artifactId>javaws</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>