Black images when saving to JPG using OpenImajDriver, fixes #134

sarxos · Aug 7, 2013 · 3772952 · 3772952
1 parent a2ee2f3
commit 3772952
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 33 deletions.
diff --git a/webcam-capture-drivers/webcam-capture-driver-openimaj/.classpath b/webcam-capture-drivers/webcam-capture-driver-openimaj/.classpath
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/example/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/...re-driver-openimaj/src/main/java/com/github/sarxos/webcam/ds/openimaj/OpenImajDevice.java b/...re-driver-openimaj/src/main/java/com/github/sarxos/webcam/ds/openimaj/OpenImajDevice.java
@@ -23,12 +23,12 @@ public class OpenImajDevice implements WebcamDevice {
 	 * but hope that OpenIMAJ can handle this.
 	 */
 	private final static Dimension[] DIMENSIONS = new Dimension[] {
-	new Dimension(176, 144),
-	new Dimension(320, 240),
-	new Dimension(352, 288),
-	new Dimension(640, 400),
-	new Dimension(640, 480),
-	new Dimension(1280, 720),
+		new Dimension(176, 144),
+		new Dimension(320, 240),
+		new Dimension(352, 288),
+		new Dimension(640, 400),
+		new Dimension(640, 480),
+		new Dimension(1280, 720),
 	};
 
 	private Device device = null;
@@ -73,7 +73,7 @@ public BufferedImage getImage() {
 		}
 
 		// TODO scale to dimension if not equal
-		return ImageUtilities.createBufferedImage(capture.getNextFrame());
+		return ImageUtilities.createBufferedImageForDisplay(capture.getNextFrame());
 	}
 
 	@Override