mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

3845 finish undoing update to open cv

Browse Source
This commit is contained in:
William Schaefer 2018-06-21 15:06:59 -04:00
parent 54d9849435
commit cd2116a00c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
View File

@ -124,9 +124,9 @@ public class ImageUtils {
if (OpenCvLoader.isOpenCvLoaded()) { if (OpenCvLoader.isOpenCvLoaded()) {
try { try {
if (System.getProperty("os.arch").equals("amd64") || System.getProperty("os.arch").equals("x86_64")) { //NON-NLS if (System.getProperty("os.arch").equals("amd64") || System.getProperty("os.arch").equals("x86_64")) { //NON-NLS
System.loadLibrary("opencv_ffmpeg2413_64"); //NON-NLS System.loadLibrary("opencv_ffmpeg248_64"); //NON-NLS
} else { } else {
System.loadLibrary("opencv_ffmpeg2413"); //NON-NLS System.loadLibrary("opencv_ffmpeg248"); //NON-NLS
} }
tempFfmpegLoaded = true; tempFfmpegLoaded = true;
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {

2
CoreLibs/nbproject/project.properties
View File

@ -56,7 +56,7 @@ file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10
file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar
file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar
file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar
file.reference.platform-3.4.0.jar=release/modules/ext/platform-3.4.0.jar file.reference.platform-3.4.0.jar=release/modules/ext/platform-3.4.0.jar
file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar

4
CoreLibs/nbproject/project.xml
View File

@ -746,8 +746,8 @@
<binary-origin>release/modules/ext/jfxtras-common-8.0-r4.jar</binary-origin> <binary-origin>release/modules/ext/jfxtras-common-8.0-r4.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/opencv-2413.jar</runtime-relative-path> <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
<binary-origin>release/modules/ext/opencv-2413.jar</binary-origin> <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path> <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>