diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java index 8d9c3a02b9..3058ce485d 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java @@ -126,9 +126,9 @@ public class ImageUtils { if (OpenCvLoader.openCvIsLoaded()) { try { if (System.getProperty("os.arch").equals("amd64") || System.getProperty("os.arch").equals("x86_64")) { //NON-NLS - System.loadLibrary("opencv_ffmpeg248_64"); //NON-NLS + System.loadLibrary("opencv_ffmpeg2413_64"); //NON-NLS } else { - System.loadLibrary("opencv_ffmpeg248"); //NON-NLS + System.loadLibrary("opencv_ffmpeg2413"); //NON-NLS } tempFfmpegLoaded = true; } catch (UnsatisfiedLinkError e) { diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 7cff41ed03..b8ef72969a 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -129,7 +129,6 @@ file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31 file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.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.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 9e19421cda..8e8b42928b 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -199,15 +199,6 @@ com.google.type com.microsoft.schemas.vml com.microsoft.schemas.vml.impl - com.sun.glass.events - com.sun.glass.events.mac - com.sun.glass.ui - com.sun.glass.ui.delegate - com.sun.glass.ui.gtk - com.sun.glass.ui.mac - com.sun.glass.ui.win - com.sun.glass.utils - com.sun.java.scene.web com.sun.javafx com.sun.javafx.animation com.sun.javafx.application @@ -288,63 +279,13 @@ com.sun.jna com.sun.jna.platform com.sun.jna.platform.dnd - com.sun.jna.platform.linux com.sun.jna.platform.mac com.sun.jna.platform.unix com.sun.jna.platform.win32 com.sun.jna.platform.wince com.sun.jna.ptr com.sun.jna.win32 - com.sun.marlin - com.sun.marlin.stats - com.sun.media.jfxmedia - com.sun.media.jfxmedia.control - com.sun.media.jfxmedia.effects - com.sun.media.jfxmedia.events - com.sun.media.jfxmedia.locator - com.sun.media.jfxmedia.logging - com.sun.media.jfxmedia.track - com.sun.media.jfxmediaimpl - com.sun.media.jfxmediaimpl.platform - com.sun.media.jfxmediaimpl.platform.gstreamer - com.sun.media.jfxmediaimpl.platform.java - com.sun.media.jfxmediaimpl.platform.osx - com.sun.openpisces - com.sun.pisces - com.sun.prism - com.sun.prism.d3d - com.sun.prism.es2 - com.sun.prism.image - com.sun.prism.impl - com.sun.prism.impl.packrect - com.sun.prism.impl.paint - com.sun.prism.impl.ps - com.sun.prism.impl.shape - com.sun.prism.j2d - com.sun.prism.j2d.paint - com.sun.prism.j2d.print - com.sun.prism.paint - com.sun.prism.ps - com.sun.prism.shader - com.sun.prism.shape - com.sun.prism.sw - com.sun.scenario com.sun.scenario.animation - com.sun.scenario.animation.shared - com.sun.scenario.effect - com.sun.scenario.effect.impl - com.sun.scenario.effect.impl.es2 - com.sun.scenario.effect.impl.hw - com.sun.scenario.effect.impl.hw.d3d - com.sun.scenario.effect.impl.prism - com.sun.scenario.effect.impl.prism.ps - com.sun.scenario.effect.impl.prism.sw - com.sun.scenario.effect.impl.state - com.sun.scenario.effect.impl.sw - com.sun.scenario.effect.impl.sw.java - com.sun.scenario.effect.impl.sw.sse - com.sun.scenario.effect.light - com.sun.util.reentrant com.twelvemonkeys.image com.twelvemonkeys.imageio com.twelvemonkeys.imageio.color @@ -610,7 +551,6 @@ org.controlsfx.validation org.controlsfx.validation.decoration org.freedesktop.gstreamer - org.freedesktop.gstreamer.controller org.freedesktop.gstreamer.device org.freedesktop.gstreamer.elements org.freedesktop.gstreamer.event @@ -620,7 +560,6 @@ org.freedesktop.gstreamer.lowlevel.annotations org.freedesktop.gstreamer.message org.freedesktop.gstreamer.query - org.freedesktop.gstreamer.video org.freedesktop.gstreamer.webrtc org.imgscalr org.joda.time @@ -1172,10 +1111,6 @@ ext/opencv-2413.jar release/modules/ext/opencv-2413.jar - - ext/opencv-248.jar - release/modules/ext/opencv-248.jar - ext/perfmark-api-0.23.0.jar release/modules/ext/perfmark-api-0.23.0.jar diff --git a/thirdparty/opencv/README.txt b/thirdparty/opencv/README.txt new file mode 100644 index 0000000000..94e4551dba --- /dev/null +++ b/thirdparty/opencv/README.txt @@ -0,0 +1,4 @@ +README: + +This is OpenCV jar and binaries from version 2.4.13.6 from opencv downloads: +https://opencv.org/releases \ No newline at end of file diff --git a/thirdparty/opencv/ext/opencv-248.jar b/thirdparty/opencv/ext/opencv-248.jar deleted file mode 100755 index f09b29077d..0000000000 Binary files a/thirdparty/opencv/ext/opencv-248.jar and /dev/null differ diff --git a/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll deleted file mode 100755 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/amd64/opencv_java248.dll b/thirdparty/opencv/lib/amd64/opencv_java248.dll deleted file mode 100755 index ab989a6b11..0000000000 Binary files a/thirdparty/opencv/lib/amd64/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll b/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll deleted file mode 100644 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll b/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_java2413.dll b/thirdparty/opencv/lib/i386/opencv_java2413.dll deleted file mode 100644 index c25b6209f8..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_java248.dll b/thirdparty/opencv/lib/i386/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll b/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll deleted file mode 100644 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_java2413.dll b/thirdparty/opencv/lib/i586/opencv_java2413.dll deleted file mode 100644 index e1aeca4ba5..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_java248.dll b/thirdparty/opencv/lib/i586/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll b/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll deleted file mode 100644 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_java2413.dll b/thirdparty/opencv/lib/i686/opencv_java2413.dll deleted file mode 100644 index e1aeca4ba5..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_java248.dll b/thirdparty/opencv/lib/i686/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll b/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll deleted file mode 100644 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll b/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_java2413.dll b/thirdparty/opencv/lib/x86/opencv_java2413.dll deleted file mode 100644 index c25b6209f8..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_java248.dll b/thirdparty/opencv/lib/x86/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll deleted file mode 100755 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86_64/opencv_java248.dll b/thirdparty/opencv/lib/x86_64/opencv_java248.dll deleted file mode 100755 index ab989a6b11..0000000000 Binary files a/thirdparty/opencv/lib/x86_64/opencv_java248.dll and /dev/null differ