Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Maven build (issue #2176) #2177

Merged
merged 2 commits into from
Jan 27, 2024
Merged

Fix Maven build (issue #2176) #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84384d8
Fix Maven build (issue #2176)
msmuenchen Jan 27, 2024
aadc5fb
Clean up more Javadoc warnings (issue #2176)
msmuenchen Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@
<link>https://jogamp.org/deployment/v2.3.2/javadoc/jogl/javadoc</link>
<link>http://junit.org/junit4/javadoc/4.13.2</link>
</links>
<sourceFileExcludes>
<exclude>org/bytedeco/javacv/FlyCaptureFrameGrabber.java</exclude>
<exclude>org/bytedeco/javacv/FFmpegLockCallback.java</exclude>
</sourceFileExcludes>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bytedeco/javacv/FFmpegLogCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}. */
saudet marked this conversation as resolved.
Show resolved Hide resolved
public static FFmpegLogCallback getInstance() {
return instance;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bytedeco/javacv/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public <I extends Indexer> 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() {
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/org/bytedeco/javacv/PS3EyeFrameGrabber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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();
Expand Down