Skip to content

Commit

Permalink
Release version 1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Nov 5, 2019
1 parent 529051a commit 9f058a7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

### November 5, 2019 version 1.5.2
* Upgrade support to FFmpeg 4.2.x
* Add `RealSense2FrameGrabber` to capture images with librealsense2
* Fix `OpenCVFrameConverter` error in `IPCameraFrameGrabber`

### July 9, 2019 version 1.5.1
* Upgrade support to OpenCV 4.1.x
* Upgrade to NetBeans 11.0 with support for recent versions of Java SE ([issue #16](https://github.com/bytedeco/procamcalib/issues/16))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ Source Code
I make all the source code available on GitHub at https://github.com/bytedeco/procamcalib . You will also need the following to modify and build the application:

* A C/C++ compiler
* JavaCPP 1.5.1 https://github.com/bytedeco/javacpp
* JavaCV 1.5.1 https://github.com/bytedeco/javacv
* JavaCPP 1.5.2 https://github.com/bytedeco/javacpp
* JavaCV 1.5.2 https://github.com/bytedeco/javacv
* OpenCV 4.1.x http://sourceforge.net/projects/opencvlibrary/files/
* FFmpeg 4.1.x http://ffmpeg.org/download.html
* FFmpeg 4.2.x http://ffmpeg.org/download.html
* ARToolKitPlus 2.3.x https://launchpad.net/artoolkitplus
* NetBeans 11.0 https://netbeans.apache.org/download/
* Maven 3.x http://maven.apache.org/download.html
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco</groupId>
<artifactId>procamcalib</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>

<name>ProCamCalib</name>
<description>A User-Friendly Method to Calibrate Cameras and Projector-Camera Systems</description>
Expand Down Expand Up @@ -161,7 +161,6 @@
<manifestEntries>
<!-- <addClasspath/> is broken: http://jira.codehaus.org/browse/MJAR-61 -->
<Class-Path>javacpp.jar javacv-platform.jar org-netbeans-api-annotations-common.jar org-netbeans-api-intent.jar org-netbeans-api-io.jar org-netbeans-api-progress.jar org-netbeans-api-progress-nb.jar org-netbeans-api-scripting.jar org-netbeans-api-templates.jar org-netbeans-bootstrap.jar org-netbeans-core.jar org-netbeans-core-startup-base.jar org-netbeans-core-startup.jar org-netbeans-libs-asm.jar org-netbeans-modules-editor-mimelookup.jar org-netbeans-modules-keyring.jar org-netbeans-modules-queries.jar org-netbeans-modules-sampler.jar org-netbeans-swing-outline.jar org-netbeans-swing-plaf.jar org-netbeans-swing-tabcontrol.jar org-openide-actions.jar org-openide-awt.jar org-openide-dialogs.jar org-openide-explorer.jar org-openide-filesystems.jar org-openide-filesystems-nb.jar org-openide-io.jar org-openide-loaders.jar org-openide-modules.jar org-openide-nodes.jar org-openide-text.jar org-openide-util.jar org-openide-util-lookup.jar org-openide-util-ui.jar org-openide-windows.jar</Class-Path>
<Name>org/bytedeco/procamcalib/</Name>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Vendor>Samuel Audet</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
Expand Down
4 changes: 2 additions & 2 deletions src/main/assembly/bin.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<id>${project.version}-bin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-bin</baseDirectory>
<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
Expand Down
3 changes: 2 additions & 1 deletion src/main/assembly/src.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>src</id>
<id>${project.version}-src</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
Expand Down

0 comments on commit 9f058a7

Please sign in to comment.