* Upgrade presets for libdc1394 2.2.5

* Fix the `FlyCapture2` module for some versions on Windows (issue #337)
bytedeco · Dec 23, 2016 · cf3db2f · cf3db2f
1 parent 43329ae
commit cf3db2f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Upgrade presets for libdc1394 2.2.5
+ * Fix the `FlyCapture2` module for some versions on Windows ([issue #337](https://github.com/bytedeco/javacpp-presets/issues/337))
  * Add functions missing from the presets of MXNet ([issue #332](https://github.com/bytedeco/javacpp-presets/issues/332))
  * Add presets for the `text` module of OpenCV 3.1 ([pull #333](https://github.com/bytedeco/javacpp-presets/pull/333))
 

diff --git a/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java b/flycapture/src/main/java/org/bytedeco/javacpp/FlyCapture2.java
@@ -6041,7 +6041,7 @@ private native void allocate(
 			 *
 			 * @param childPort The port to add.
 			 */
-			public native void AddPort( @Cast("FlyCapture2::TopologyNode::PortType") int childPort );
+
 
 			/**
 			 * Assign a PGRGuid and device ID to the node.

diff --git a/flycapture/src/main/java/org/bytedeco/javacpp/presets/FlyCapture2.java b/flycapture/src/main/java/org/bytedeco/javacpp/presets/FlyCapture2.java
@@ -47,12 +47,12 @@
         @Platform(value = {"linux-x86", "linux-arm"}, link = "flycapture@.2", includepath = "/usr/include/flycapture/"),
         @Platform(value = "windows", link = "FlyCapture2",
                 includepath = "C:/Program Files/Point Grey Research/FlyCapture2/include/"),
-        @Platform(value = "windows-x86",    define = {"WIN32", "AddPort AddPortA"},
+        @Platform(value = "windows-x86",
                 linkpath    = {"C:/Program Files/Point Grey Research/FlyCapture2/lib/",
                                "C:/Program Files (x86)/Point Grey Research/FlyCapture2/lib/"},
                 preloadpath = {"C:/Program Files/Point Grey Research/FlyCapture2/bin/",
                                "C:/Program Files (x86)/Point Grey Research/FlyCapture2/bin/"}),
-        @Platform(value = "windows-x86_64", define = {"WIN64", "AddPort AddPortA"},
+        @Platform(value = "windows-x86_64",
                 linkpath    = "C:/Program Files/Point Grey Research/FlyCapture2/lib64/",
                 preloadpath = "C:/Program Files/Point Grey Research/FlyCapture2/bin64/") })
 public class FlyCapture2 implements InfoMapper {
@@ -61,6 +61,7 @@ public void map(InfoMap infoMap) {
                .put(new Info("defined(WIN32) || defined(WIN64)").define())
                .put(new Info("FlyCapture2::ImageEventCallback").valueTypes("ImageEventCallback")
                        .pointerTypes("@Cast(\"FlyCapture2::ImageEventCallback*\") @ByPtrPtr ImageEventCallback"))
-               .put(new Info("FlyCapture2::CameraBase::GetRegisterString", "FlyCapture2::CameraBase::StartSyncCapture").skip());
+               .put(new Info("FlyCapture2::CameraBase::GetRegisterString", "FlyCapture2::CameraBase::StartSyncCapture",
+                             "FlyCapture2::TopologyNode::AddPort").skip());
     }
 }
diff --git a/libdc1394/cppbuild.sh b/libdc1394/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LIBDC1394_VERSION=2.2.4
+LIBDC1394_VERSION=2.2.5
 download http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$LIBDC1394_VERSION/libdc1394-$LIBDC1394_VERSION.tar.gz libdc1394-$LIBDC1394_VERSION.tar.gz
 
 mkdir -p $PLATFORM

diff --git a/libdc1394/platform/pom.xml b/libdc1394/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>libdc1394-platform</artifactId>
-  <version>2.2.4-${project.parent.version}</version>
+  <version>2.2.5-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for libdc1394</name>
 
   <properties>

diff --git a/libdc1394/pom.xml b/libdc1394/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>libdc1394</artifactId>
-  <version>2.2.4-${project.parent.version}</version>
+  <version>2.2.5-${project.parent.version}</version>
   <name>JavaCPP Presets for libdc1394</name>
 
   <properties>

diff --git a/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java b/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java
@@ -838,6 +838,15 @@ public static class dc1394camera_list_t extends Pointer {
  */
 public static native @Cast("dc1394error_t") int dc1394_camera_print_info(dc1394camera_t camera, @Cast("FILE*") Pointer fd);
 
+/**
+ * Returns a pointer to a string identifying the platform for the cameras. Platforms strings are:
+ * juju, linux, macosx, windows, usb
+ */
+public static native @Cast("dc1394error_t") int dc1394_camera_get_platform_string(dc1394camera_t camera, @Cast("const char**") PointerPointer platform);
+public static native @Cast("dc1394error_t") int dc1394_camera_get_platform_string(dc1394camera_t camera, @Cast("const char**") @ByPtrPtr BytePointer platform);
+public static native @Cast("dc1394error_t") int dc1394_camera_get_platform_string(dc1394camera_t camera, @Cast("const char**") @ByPtrPtr ByteBuffer platform);
+public static native @Cast("dc1394error_t") int dc1394_camera_get_platform_string(dc1394camera_t camera, @Cast("const char**") @ByPtrPtr byte[] platform);
+
 // #ifdef __cplusplus
 // #endif
 

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>libdc1394-platform</artifactId>
-      <version>2.2.4-${project.version}</version>
+      <version>2.2.5-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>