From dd7563376bf6f5e56515e63b847dd3c7ff1f83e2 Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 14 Nov 2017 22:04:53 -0800 Subject: [PATCH] Force load OpenCV and cscore libraries on program initialization (#716) Fixes bugs where Mat's are initialized before anything cscore was called. --- .../java/edu/wpi/first/wpilibj/RobotBase.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 54cb02d84d..ee0d11ce50 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.net.URL; import java.util.Enumeration; import java.util.jar.Manifest; -//import org.opencv.core.Core; +import edu.wpi.cscore.CameraServerJNI; import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances; import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType; @@ -179,16 +179,9 @@ public abstract class RobotBase { HLUsageReporting.SetImplementation(new HardwareHLUsageReporting()); RobotState.SetImplementation(DriverStation.getInstance()); - // Load opencv - /* TODO (after opencv is added again) - try { - System.loadLibrary(Core.NATIVE_LIBRARY_NAME); - } catch (UnsatisfiedLinkError ex) { - System.out.println("OpenCV Native Libraries could not be loaded."); - System.out.println("Please try redeploying, or reimage your roboRIO and try again."); - ex.printStackTrace(); - } - */ + // Call a CameraServer JNI function to force OpenCV native library loading + // Needed because all the OpenCV JNI functions don't have built in loading + CameraServerJNI.enumerateSinks(); } /**