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

Update for FlyCapture v.2.10.3.266. #400

Merged
merged 2 commits into from
Apr 1, 2017
Merged

Update for FlyCapture v.2.10.3.266. #400

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
0e9e615
Update for FlyCapture v.2.10.3.266.
jpsacha Mar 24, 2017
6410bd0
Revert changes to videoInputLib.java
saudet Apr 1, 2017
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: 2 additions & 2 deletions flycapture/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* FlyCapture 2.9.3.43 http://www.ptgrey.com/flycapture-sdk
* FlyCapture 2.10.3.266 http://www.ptgrey.com/flycapture-sdk

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>flycapture-platform</artifactId>
<version>2.9.3.43-1.3</version>
<version>2.10.3.266-1.3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Expand Down
2 changes: 1 addition & 1 deletion flycapture/cppbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

FLYCAPTURE_VERSION=2.9.3.43
FLYCAPTURE_VERSION=2.10.3.266

case $PLATFORM in
linux-arm*)
Expand Down
2 changes: 1 addition & 1 deletion flycapture/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>flycapture-platform</artifactId>
<version>2.9.3.43-${project.parent.version}</version>
<version>2.10.3.266-${project.parent.version}</version>
<name>JavaCPP Presets Platform for FlyCapture</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion flycapture/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>flycapture</artifactId>
<version>2.9.3.43-${project.parent.version}</version>
<version>2.10.3.266-${project.parent.version}</version>
<name>JavaCPP Presets for FlyCapture</name>

<properties>
Expand Down
424 changes: 400 additions & 24 deletions flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading