Fix builds for OpenCV and FFmpeg too

bytedeco · Jan 3, 2024 · 6c4770d · 6c4770d
1 parent 869a41c
commit 6c4770d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ffmpeg/platform/gpl/pom.xml b/ffmpeg/platform/gpl/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>ffmpeg-platform-gpl</artifactId>
-  <version>6.0-${project.parent.version}</version>
+  <version>6.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for FFmpeg (GPL enabled)</name>
 
   <properties>

diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Samuel Audet
+ * Copyright (C) 2018-2024 Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -50,6 +50,7 @@
         opencv_xphoto.class,
         opencv_barcode.class,
         opencv_wechat_qrcode.class,
+        opencv_dnn_superres.class,
     },
     value = {
         @Platform(preload = {"[email protected]", "[email protected]", "[email protected]", "[email protected]", "opencv_java"}),

diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java
@@ -67,10 +67,10 @@
     value = {
         @Platform(preload = {"[email protected]", "[email protected]", "[email protected]", "[email protected]",
                              "[email protected]", "[email protected]", "[email protected]", "[email protected]",
-                             "[email protected]", "[email protected]", "[email protected]"}),
+                             "[email protected]", "[email protected]", "[email protected]", "[email protected]"}),
         @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490",
                              "opencv_cudacodec490", "opencv_cudaobjdetect490", "opencv_cudabgsegm490", "opencv_cudastereo490",
-                             "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}),
+                             "opencv_cudafeatures2d490", "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}),
     }
 )
 public class opencv_python3 {