From 84384d81f74d9f8093ab1000ecfec4226fa283b3 Mon Sep 17 00:00:00 2001 From: Marco Schuster Date: Sat, 27 Jan 2024 13:22:41 +0100 Subject: [PATCH 1/2] Fix Maven build (issue #2176) --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 938c0933..e11b2cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -301,6 +301,10 @@ https://jogamp.org/deployment/v2.3.2/javadoc/jogl/javadoc http://junit.org/junit4/javadoc/4.13.2 + + org/bytedeco/javacv/FlyCaptureFrameGrabber.java + org/bytedeco/javacv/FFmpegLockCallback.java + From aadc5fbb13224311547521834a0294cf1639d9ce Mon Sep 17 00:00:00 2001 From: Marco Schuster Date: Sat, 27 Jan 2024 13:38:55 +0100 Subject: [PATCH 2/2] Clean up more Javadoc warnings (issue #2176) --- .../java/org/bytedeco/javacv/FFmpegLogCallback.java | 2 +- src/main/java/org/bytedeco/javacv/Frame.java | 2 +- .../java/org/bytedeco/javacv/PS3EyeFrameGrabber.java | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/bytedeco/javacv/FFmpegLogCallback.java b/src/main/java/org/bytedeco/javacv/FFmpegLogCallback.java index 10947e95..593869ee 100644 --- a/src/main/java/org/bytedeco/javacv/FFmpegLogCallback.java +++ b/src/main/java/org/bytedeco/javacv/FFmpegLogCallback.java @@ -41,7 +41,7 @@ public class FFmpegLogCallback extends LogCallback { static final FFmpegLogCallback instance = new FFmpegLogCallback().retainReference(); - /** Returns an instance that can be used with {@link #setLogCallback(LogCallback)}. */ + /** Returns an instance that can be used with {@link org.bytedeco.ffmpeg.global.avutil#setLogCallback(LogCallback)}. */ public static FFmpegLogCallback getInstance() { return instance; } diff --git a/src/main/java/org/bytedeco/javacv/Frame.java b/src/main/java/org/bytedeco/javacv/Frame.java index ec506037..496d9022 100644 --- a/src/main/java/org/bytedeco/javacv/Frame.java +++ b/src/main/java/org/bytedeco/javacv/Frame.java @@ -213,7 +213,7 @@ public I createIndexer(boolean direct, int i) { * @return A deep copy of this frame. * @see {@link #cloneBufferArray} * - * @author Extension proposed by Dragos Dutu + * Extension proposed by Dragos Dutu * */ @Override public Frame clone() { diff --git a/src/main/java/org/bytedeco/javacv/PS3EyeFrameGrabber.java b/src/main/java/org/bytedeco/javacv/PS3EyeFrameGrabber.java index 24995a45..5d593012 100644 --- a/src/main/java/org/bytedeco/javacv/PS3EyeFrameGrabber.java +++ b/src/main/java/org/bytedeco/javacv/PS3EyeFrameGrabber.java @@ -118,7 +118,7 @@ public PS3EyeFrameGrabber() throws Exception { } /** Color mode, VGA resolution, 60 FPS frame rate. - * @param system wide camera index + * @param cameraIndex system wide camera index */ public PS3EyeFrameGrabber(int cameraIndex) throws Exception { this(cameraIndex, 640, 480, 60); @@ -274,9 +274,8 @@ public Frame grab() throws Exception { } - /** Start camera first (before grabbing). - * - * @return success/failure (true/false) + /** + * Start camera first (before grabbing). */ public void start() throws Exception { boolean b; @@ -301,9 +300,8 @@ public void start() throws Exception { } - /** Stop camera. It can be re-started if needed. - * - * @return success/failure (true/false) + /** + * Stop camera. It can be re-started if needed. */ public void stop() throws Exception { boolean b = camera.stopCamera();