diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTagsUtil.java b/Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTagsUtil.java
index 53dc304b27..45bb97cc57 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTagsUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/imagetagging/ImageTagsUtil.java
@@ -29,13 +29,12 @@ import javafx.concurrent.Task;
import javafx.embed.swing.SwingFXUtils;
import javafx.scene.image.Image;
import javax.imageio.ImageIO;
-import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.MatOfByte;
import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
-import org.opencv.highgui.Highgui;
+import org.opencv.imgcodecs.Imgcodecs;
import org.opencv.imgproc.Imgproc;
import org.sleuthkit.autopsy.coreutils.ImageUtils;
import org.sleuthkit.datamodel.AbstractFile;
@@ -124,7 +123,7 @@ public final class ImageTagsUtil {
byte[] imageBytes = outStream.toByteArray();
MatOfByte rawSourceBytes = new MatOfByte(imageBytes);
- Mat sourceImage = Highgui.imdecode(rawSourceBytes, Highgui.IMREAD_COLOR);
+ Mat sourceImage = Imgcodecs.imdecode(rawSourceBytes, Imgcodecs.IMREAD_COLOR);
rawSourceBytes.release();
return sourceImage;
@@ -150,12 +149,12 @@ public final class ImageTagsUtil {
int rectangleBorderWidth = (int) Math.rint(region.getStrokeThickness());
- Core.rectangle(sourceImage, topLeft, bottomRight,
+ Imgproc.rectangle(sourceImage, topLeft, bottomRight,
rectangleBorderColor, rectangleBorderWidth);
}
MatOfByte taggedMatrix = new MatOfByte();
- Highgui.imencode(OPENCV_PNG, sourceImage, taggedMatrix);
+ Imgcodecs.imencode(OPENCV_PNG, sourceImage, taggedMatrix);
return taggedMatrix;
}
@@ -200,13 +199,13 @@ public final class ImageTagsUtil {
*/
private static MatOfByte getResizedMatrix(MatOfByte taggedMatrix, IconSize size) {
Size resizeDimensions = new Size(size.getSize(), size.getSize());
- Mat taggedImage = Highgui.imdecode(taggedMatrix, Highgui.IMREAD_COLOR);
+ Mat taggedImage = Imgcodecs.imdecode(taggedMatrix, Imgcodecs.IMREAD_COLOR);
Mat thumbnailImage = new Mat();
Imgproc.resize(taggedImage, thumbnailImage, resizeDimensions);
MatOfByte thumbnailMatrix = new MatOfByte();
- Highgui.imencode(OPENCV_PNG, thumbnailImage, thumbnailMatrix);
+ Imgcodecs.imencode(OPENCV_PNG, thumbnailImage, thumbnailMatrix);
thumbnailImage.release();
taggedImage.release();
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
index 1cb0a40d35..459495f3ce 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
@@ -31,7 +31,7 @@ import java.util.TreeSet;
import java.util.logging.Level;
import org.netbeans.api.progress.ProgressHandle;
import org.opencv.core.Mat;
-import org.opencv.highgui.VideoCapture;
+import org.opencv.videoio.VideoCapture;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryUiUtils.java
index e94ca0c1a0..3406b4befc 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryUiUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DiscoveryUiUtils.java
@@ -43,7 +43,7 @@ import org.apache.commons.io.FilenameUtils;
import org.imgscalr.Scalr;
import org.netbeans.api.progress.ProgressHandle;
import org.opencv.core.Mat;
-import org.opencv.highgui.VideoCapture;
+import org.opencv.videoio.VideoCapture;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 0ee54ddc28..2f3f278b12 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -100,7 +100,7 @@ file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
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-248.jar=release/modules/ext/opencv-248.jar
+file.reference.opencv-3416.jar=release/modules/ext/opencv-3416.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 0d79f414b1..59eb3cecbf 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -451,13 +451,14 @@
org.opencv.core
org.opencv.features2d
org.opencv.gpu
- org.opencv.highgui
org.opencv.imgproc
org.opencv.ml
org.opencv.objdetect
org.opencv.photo
org.opencv.utils
org.opencv.video
+ org.opencv.videoio
+ org.opencv.imgcodecs
org.sleuthkit.autopsy.corelibs
org.slf4j
org.slf4j.event
@@ -873,8 +874,8 @@
release/modules/ext/opencensus-proto-0.2.0.jar
- ext/opencv-248.jar
- release/modules/ext/opencv-248.jar
+ ext/opencv-3416.jar
+ release/modules/ext/opencv-3416.jar
ext/perfmark-api-0.23.0.jar
diff --git a/thirdparty/opencv/ext/opencv-3416.jar b/thirdparty/opencv/ext/opencv-3416.jar
new file mode 100755
index 0000000000..41b864171c
Binary files /dev/null and b/thirdparty/opencv/ext/opencv-3416.jar differ
diff --git a/thirdparty/opencv/lib/x86/opencv_java3416.dll b/thirdparty/opencv/lib/x86/opencv_java3416.dll
new file mode 100755
index 0000000000..3fd35050da
Binary files /dev/null and b/thirdparty/opencv/lib/x86/opencv_java3416.dll differ
diff --git a/thirdparty/opencv/lib/x86_64/opencv_ffmpeg3416_64.dll b/thirdparty/opencv/lib/x86_64/opencv_ffmpeg3416_64.dll
new file mode 100755
index 0000000000..ed3b7a0f0e
Binary files /dev/null and b/thirdparty/opencv/lib/x86_64/opencv_ffmpeg3416_64.dll differ
diff --git a/thirdparty/opencv/lib/x86_64/opencv_java3416.dll b/thirdparty/opencv/lib/x86_64/opencv_java3416.dll
new file mode 100755
index 0000000000..23384ae2d9
Binary files /dev/null and b/thirdparty/opencv/lib/x86_64/opencv_java3416.dll differ