revert project.xml and update ImageUtils to reference opencv_ffmpeg 2.4.13

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) {

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

CoreLibs/nbproject/project.xml

@@ -199,15 +199,6 @@
                 <package>com.google.type</package>
                 <package>com.microsoft.schemas.vml</package>
                 <package>com.microsoft.schemas.vml.impl</package>
-                <package>com.sun.glass.events</package>
-                <package>com.sun.glass.events.mac</package>
-                <package>com.sun.glass.ui</package>
-                <package>com.sun.glass.ui.delegate</package>
-                <package>com.sun.glass.ui.gtk</package>
-                <package>com.sun.glass.ui.mac</package>
-                <package>com.sun.glass.ui.win</package>
-                <package>com.sun.glass.utils</package>
-                <package>com.sun.java.scene.web</package>
                 <package>com.sun.javafx</package>
                 <package>com.sun.javafx.animation</package>
                 <package>com.sun.javafx.application</package>
@@ -288,63 +279,13 @@
                 <package>com.sun.jna</package>
                 <package>com.sun.jna.platform</package>
                 <package>com.sun.jna.platform.dnd</package>
-                <package>com.sun.jna.platform.linux</package>
                 <package>com.sun.jna.platform.mac</package>
                 <package>com.sun.jna.platform.unix</package>
                 <package>com.sun.jna.platform.win32</package>
                 <package>com.sun.jna.platform.wince</package>
                 <package>com.sun.jna.ptr</package>
                 <package>com.sun.jna.win32</package>
-                <package>com.sun.marlin</package>
-                <package>com.sun.marlin.stats</package>
-                <package>com.sun.media.jfxmedia</package>
-                <package>com.sun.media.jfxmedia.control</package>
-                <package>com.sun.media.jfxmedia.effects</package>
-                <package>com.sun.media.jfxmedia.events</package>
-                <package>com.sun.media.jfxmedia.locator</package>
-                <package>com.sun.media.jfxmedia.logging</package>
-                <package>com.sun.media.jfxmedia.track</package>
-                <package>com.sun.media.jfxmediaimpl</package>
-                <package>com.sun.media.jfxmediaimpl.platform</package>
-                <package>com.sun.media.jfxmediaimpl.platform.gstreamer</package>
-                <package>com.sun.media.jfxmediaimpl.platform.java</package>
-                <package>com.sun.media.jfxmediaimpl.platform.osx</package>
-                <package>com.sun.openpisces</package>
-                <package>com.sun.pisces</package>
-                <package>com.sun.prism</package>
-                <package>com.sun.prism.d3d</package>
-                <package>com.sun.prism.es2</package>
-                <package>com.sun.prism.image</package>
-                <package>com.sun.prism.impl</package>
-                <package>com.sun.prism.impl.packrect</package>
-                <package>com.sun.prism.impl.paint</package>
-                <package>com.sun.prism.impl.ps</package>
-                <package>com.sun.prism.impl.shape</package>
-                <package>com.sun.prism.j2d</package>
-                <package>com.sun.prism.j2d.paint</package>
-                <package>com.sun.prism.j2d.print</package>
-                <package>com.sun.prism.paint</package>
-                <package>com.sun.prism.ps</package>
-                <package>com.sun.prism.shader</package>
-                <package>com.sun.prism.shape</package>
-                <package>com.sun.prism.sw</package>
-                <package>com.sun.scenario</package>
                 <package>com.sun.scenario.animation</package>
-                <package>com.sun.scenario.animation.shared</package>
-                <package>com.sun.scenario.effect</package>
-                <package>com.sun.scenario.effect.impl</package>
-                <package>com.sun.scenario.effect.impl.es2</package>
-                <package>com.sun.scenario.effect.impl.hw</package>
-                <package>com.sun.scenario.effect.impl.hw.d3d</package>
-                <package>com.sun.scenario.effect.impl.prism</package>
-                <package>com.sun.scenario.effect.impl.prism.ps</package>
-                <package>com.sun.scenario.effect.impl.prism.sw</package>
-                <package>com.sun.scenario.effect.impl.state</package>
-                <package>com.sun.scenario.effect.impl.sw</package>
-                <package>com.sun.scenario.effect.impl.sw.java</package>
-                <package>com.sun.scenario.effect.impl.sw.sse</package>
-                <package>com.sun.scenario.effect.light</package>
-                <package>com.sun.util.reentrant</package>
                 <package>com.twelvemonkeys.image</package>
                 <package>com.twelvemonkeys.imageio</package>
                 <package>com.twelvemonkeys.imageio.color</package>
@@ -610,7 +551,6 @@
                 <package>org.controlsfx.validation</package>
                 <package>org.controlsfx.validation.decoration</package>
                 <package>org.freedesktop.gstreamer</package>
-                <package>org.freedesktop.gstreamer.controller</package>
                 <package>org.freedesktop.gstreamer.device</package>
                 <package>org.freedesktop.gstreamer.elements</package>
                 <package>org.freedesktop.gstreamer.event</package>
@@ -620,7 +560,6 @@
                 <package>org.freedesktop.gstreamer.lowlevel.annotations</package>
                 <package>org.freedesktop.gstreamer.message</package>
                 <package>org.freedesktop.gstreamer.query</package>
-                <package>org.freedesktop.gstreamer.video</package>
                 <package>org.freedesktop.gstreamer.webrtc</package>
                 <package>org.imgscalr</package>
                 <package>org.joda.time</package>
@@ -1172,10 +1111,6 @@
                 <runtime-relative-path>ext/opencv-2413.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-2413.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/perfmark-api-0.23.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/perfmark-api-0.23.0.jar</binary-origin>

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