From 41dd9e4f06889d16f942cb33816e6b75d70acc56 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Fri, 11 Nov 2016 21:55:13 -0800
Subject: [PATCH] Loads OpenCV JNI Library in Java (#15)

---
 java/src/edu/wpi/cscore/CameraServerJNI.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/java/src/edu/wpi/cscore/CameraServerJNI.java b/java/src/edu/wpi/cscore/CameraServerJNI.java
index cf0b8d660f..380e30ffce 100644
--- a/java/src/edu/wpi/cscore/CameraServerJNI.java
+++ b/java/src/edu/wpi/cscore/CameraServerJNI.java
@@ -13,9 +13,11 @@ import java.io.OutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.opencv.core.Core;
 
 public class CameraServerJNI {
   static boolean libraryLoaded = false;
+  static boolean cvLibraryLoaded = false;
   static File jniLibrary = null;
   static {
     if (!libraryLoaded) {
@@ -69,6 +71,15 @@ public class CameraServerJNI {
         }
       }
       libraryLoaded = true;
+      if (!cvLibraryLoaded) {
+        try {
+          System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+        } catch (UnsatisfiedLinkError ex) {
+          ex.printStackTrace();
+          System.exit(1);
+        }
+        cvLibraryLoaded = true;
+      }
     }
   }