diff options
| author | Mihael Koep <koep@schneide.com> | 2014-07-31 16:09:17 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2014-10-07 13:08:08 +0200 |
| commit | 6f73f9daa1f9d1ac6054dec6e06b93e040a011f2 (patch) | |
| tree | dea14af80c7dd57cb4e9c898afed890c425b7272 | |
| parent | fb8cd3a6a49f7591cc504c0a78035ac1ef4467d8 (diff) | |
| download | uca-6f73f9daa1f9d1ac6054dec6e06b93e040a011f2.tar.gz uca-6f73f9daa1f9d1ac6054dec6e06b93e040a011f2.tar.bz2 uca-6f73f9daa1f9d1ac6054dec6e06b93e040a011f2.tar.xz uca-6f73f9daa1f9d1ac6054dec6e06b93e040a011f2.zip | |
Update pylon-plugin to libpyloncam 0.4
| -rw-r--r-- | plugins/pylon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/pylon/changelog.txt | 3 | ||||
| -rw-r--r-- | plugins/pylon/uca-pylon-camera.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 1265e8c..02f65c9 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) -set(VERSION "1.1.1") +set(VERSION "1.2.0") find_package(Pylon) @@ -11,7 +11,7 @@ if (PYLON_FOUND) set(PLUGIN_SUMMARY "Pylon plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") set(PLUGIN_DESCRIPTION "Plugin for the Basler GigE CCD Camera.") - set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.3.0") + set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.4.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in diff --git a/plugins/pylon/changelog.txt b/plugins/pylon/changelog.txt index adfa95b..5a004cf 100644 --- a/plugins/pylon/changelog.txt +++ b/plugins/pylon/changelog.txt @@ -1,3 +1,6 @@ +* Thu Jul 31 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.2.0-1 +- require libpyloncam 0.4.0 +- update to modified libpyloncam API * Wed Apr 9 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.1.1-1 - remove unneeded memory allocation - require libpyloncam 0.3.0 diff --git a/plugins/pylon/uca-pylon-camera.c b/plugins/pylon/uca-pylon-camera.c index 134dda3..bac9684 100644 --- a/plugins/pylon/uca-pylon-camera.c +++ b/plugins/pylon/uca-pylon-camera.c @@ -364,7 +364,7 @@ static gboolean uca_pylon_camera_initable_init(GInitable *initable, GCancellable g_error("no environment variable PYLON_CAMERA_IP found"); } - pylon_camera_new("/usr/local/lib64", pylon_camera_ip, error); + pylon_camera_new(pylon_camera_ip, error); if (*error != NULL) { return FALSE; } |