Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force load OpenCV and cscore libraries on program initialization (#716)

Browse Source 
Fixes bugs where Mat's are initialized before anything cscore was
called.
This commit is contained in:
Thad House
2017-11-14 22:04:53 -08:00
committed by Peter Johnson
parent 14fcf3f2f0
commit dd7563376b
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
View File

@@ -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();
}
/**