diff --git a/CHANGELOG.md b/CHANGELOG.md index 76857dd6861..c105ebbc8e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ + * Fix loading issue with `opencv_cudaobjdetect` and `opencv_cudaoptflow` on Windows ([issue #592](https://github.com/bytedeco/javacpp-presets/issues/592)) + ### July 17, 2018 version 1.4.2 * Fix FFmpeg build of libvpx with Linux on ARM ([issue #586](https://github.com/bytedeco/javacpp-presets/issues/586)) * Enable MediaCodec acceleration for FFmpeg on Android ([pull #589](https://github.com/bytedeco/javacpp-presets/pull/589)) diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java index e3b069eaad9..ccdfb0fc3a2 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java index 62b7eda885f..49fe379d63c 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java index fa0855bc3a0..04d897c658c 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java index 0e95e4e8035..d8e479f38d3 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java index c3e6a79a340..d528f9be6b9 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java index ebfdf383bdd..1323a47001b 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java index e84a71c94ba..d2936acbd00 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java index 572fd78e8cd..423692fae21 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java index 5a264cb66a7..2ff7d1e1737 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java index e9373493b24..69f93bb0b9d 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java index b2a10da95d8..e2fcea45f8a 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java index 4d9c6b9b413..6bee034342b 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java index f772736c590..dd322e009ca 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java index 178d45a2371..d6b5ab4085e 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java index 584caf45f0b..deb466d2bfc 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java index 6da253ca79e..c663baad322 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java index 1f18cdd54d5..5ead67bbd78 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java index c145ec769cf..89ba7164ae4 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java index 4ea14dabc69..052280c3d63 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java index b2ce5efb376..2c7ce1fb622 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java index 2a0495e4085..bb0b6aad02d 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java index 0b2ff391680..4ca2f6f46a0 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java index 4017620a7b7..032f05b37ca 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java index cad1c2371f3..075b014415d 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java index 50715c2fd1c..5ea1f99075e 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java index 4f5f609b767..aa57dde7ae1 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java index 6894787406b..201d00f2f42 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java index 59fa0a0c056..d639dcf634b 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java index 7ec3e6a3f90..3b56e07ae96 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java index a85dfaf9172..05772dd66bb 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java index 6193d21dcfa..fbbb8c79f26 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java index ed67885437f..c7a8b898ff0 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java index 797ca9fe183..5a0a198b3b5 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java index f8b1326ac61..d87cac430f8 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java index 5325afc0808..c519e41377a 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java index 410286d3bb9..ea23a8e7065 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java index cce9073044f..60bf2119a4a 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java index 687bfe149ea..80a67211023 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.javacpp; diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java index fb36e8f4b16..acbd0d92d19 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java @@ -47,6 +47,7 @@ @Platform( value = "windows", link = "opencv_cudaobjdetect342", + preload = "opencv_cudalegacy342", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java index d2e8ea54a17..415c0f9438d 100644 --- a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java +++ b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java @@ -46,6 +46,7 @@ @Platform( value = "windows", link = "opencv_cudaoptflow342", + preload = "opencv_cudalegacy342", extension = "-gpu" ) },