diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml index b309333eb03..cd16f0f0a9e 100644 --- a/.github/actions/deploy-centos/action.yml +++ b/.github/actions/deploy-centos/action.yml @@ -128,11 +128,9 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then echo Installing Spinnaker amd64 - python3 -m gdown.cli https://drive.google.com/uc?id=1DiI8mG1fyewEGWxW7keg-dqXk0rLwmAK - tar -xzvf spinnaker-1.27.0.48-Ubuntu16.04-amd64-pkg.tar.gz - find -name *.deb | while read f; do ar -xv $f; tar --totals -xf data.tar.xz -C /; done; - ln -s libSpinnaker_C.so.1.27.0.48 /usr/lib/libSpinnaker_C.so.1 - ln -s libSpinnaker.so.1.27.0.48 /usr/lib/libSpinnaker.so.1 + python3 -m gdown.cli https://drive.google.com/uc?id=1zr9k4x-NI3OkVMLCccSBY4VtR-16iAQG + tar -xzvf spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz + find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done; fi if [[ -n ${CI_DEPLOY_NEED_GCC:-} ]]; then diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index cf122ad5c3d..5d8c95bc537 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -113,20 +113,20 @@ runs: if "%CI_DEPLOY_PLATFORM%"=="windows-x86" if "%CI_DEPLOY_MODULE%"=="spinnaker" ( echo Installing Spinnaker x86 - python -m gdown.cli https://drive.google.com/uc?id=1kufOTKKEGXbaQemjRi8Zy2H98FkL-k6W - python -m gdown.cli https://drive.google.com/uc?id=1FNweWcn-keLqvy56xqz3Ve_T3adz43rW + python -m gdown.cli https://drive.google.com/uc?id=15i6tV-vahgm_uNWT96c_KX7tFdZxmev- + python -m gdown.cli https://drive.google.com/uc?id=1ikOyG-gVettvjoJGQWkHxOcBWuTrGyfz rem We can get these msi files by starting the installation from the exe file - cmd.exe /c "msiexec /quiet /i Spinnaker-1.27.0.48_Binaries_v140_x86.msi ADDLOCAL=ALL" - cmd.exe /c "msiexec /quiet /i Spinnaker-1.27.0.48_SourceCode_v140_x86.msi ADDLOCAL=ALL" + cmd.exe /c "msiexec /quiet /i Spinnaker-2.4.0.143_Binaries_v140_x86.msi ADDLOCAL=ALL" + cmd.exe /c "msiexec /quiet /i Spinnaker-2.4.0.143_SourceCode_v140_x86.msi ADDLOCAL=ALL" ) if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if "%CI_DEPLOY_MODULE%"=="spinnaker" ( echo Installing Spinnaker x64 - python -m gdown.cli https://drive.google.com/uc?id=1xIqjBwl3Q9GnEPcs9JdZBJNmOSWD8gRE - python -m gdown.cli https://drive.google.com/uc?id=1l74LjV8rANk_P_CvXZOMSzi7J02YVkfD + python -m gdown.cli https://drive.google.com/uc?id=1NiMxxDflip1F5rJuf73xhfoI9vWUeUkQ + python -m gdown.cli https://drive.google.com/uc?id=1FKatuVsLIQLbDb9R9W2ax_tav8_7--HI rem We can get these msi files by starting the installation from the exe file - cmd.exe /c "msiexec /quiet /i Spinnaker-1.27.0.48_Binaries_v140_x64.msi ADDLOCAL=ALL" - cmd.exe /c "msiexec /quiet /i Spinnaker-1.27.0.48_SourceCode_v140_x64.msi ADDLOCAL=ALL" + cmd.exe /c "msiexec /quiet /i Spinnaker-2.4.0.143_Binaries_v140_x64.msi ADDLOCAL=ALL" + cmd.exe /c "msiexec /quiet /i Spinnaker-2.4.0.143_SourceCode_v140_x64.msi ADDLOCAL=ALL" ) set GRADLE_TASK=publishToMavenLocal diff --git a/CHANGELOG.md b/CHANGELOG.md index 2099b4a58ce..361743ebe77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Map `std::vector` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607)) * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017)) * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016)) - * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Arrow 4.0.0, librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0 + * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Spinnaker 2.4.0.143 ([pull #1040](https://github.com/bytedeco/javacpp-presets/pull/1040)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), Arrow 4.0.0, MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0 ### March 8, 2021 version 1.5.5 * Bundle LLD executable in presets for LLVM as required by TVM on Windows diff --git a/README.md b/README.md index 21b8df4456d..1e6e6ca8f15 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * OpenCV 4.5.2 https://opencv.org/releases.html * FFmpeg 4.4.x http://ffmpeg.org/download.html * FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk - * Spinnaker 1.27.x https://www.flir.com/products/spinnaker-sdk + * Spinnaker 2.4.x https://www.flir.com/products/spinnaker-sdk * libdc1394 2.2.6 http://sourceforge.net/projects/libdc1394/files/ * libfreenect 0.5.7 https://github.com/OpenKinect/libfreenect * libfreenect2 0.2.0 https://github.com/OpenKinect/libfreenect2 diff --git a/ci/install-travis.sh b/ci/install-travis.sh index 7b3004416cf..5a3cec0ada7 100755 --- a/ci/install-travis.sh +++ b/ci/install-travis.sh @@ -123,16 +123,16 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an fi if [[ "$PROJ" =~ spinnaker ]]; then if [ "$OS" == "linux-x86_64" ]; then - if [[ $(find $HOME/downloads/spinnaker-1.27.0.48-Ubuntu16.04-amd64-pkg.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then + if [[ $(find $HOME/downloads/spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then echo "Found spinnaker in cache and size seems ok" else echo "Downloading spinnaker as not found in cache or too small" - python $TRAVIS_BUILD_DIR/ci/gDownload.py 1DiI8mG1fyewEGWxW7keg-dqXk0rLwmAK $HOME/downloads/spinnaker-1.27.0.48-Ubuntu16.04-amd64-pkg.tar.gz + python $TRAVIS_BUILD_DIR/ci/gDownload.py 1zr9k4x-NI3OkVMLCccSBY4VtR-16iAQG $HOME/downloads/spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz fi - tar xzvf $HOME/downloads/spinnaker-1.27.0.48-Ubuntu16.04-amd64-pkg.tar.gz -C $TRAVIS_BUILD_DIR/../ - ls $TRAVIS_BUILD_DIR/../spinnaker-1.27.0.48-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done; - ln -s libSpinnaker_C.so.1.27.0.48 usr/lib/libSpinnaker_C.so.1 - ln -s libSpinnaker.so.1.27.0.48 usr/lib/libSpinnaker.so.1 + tar xzvf $HOME/downloads/spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz -C $TRAVIS_BUILD_DIR/../ + ls $TRAVIS_BUILD_DIR/../spinnaker-2.4.0.143-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done; + ln -s libSpinnaker_C.so.2.4.0.143 usr/lib/libSpinnaker_C.so.1 + ln -s libSpinnaker.so.2.4.0.143 usr/lib/libSpinnaker.so.1 cp -a usr $TRAVIS_BUILD_DIR/../ docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -a $HOME/build/usr/* /usr/" fi diff --git a/ci/install-windows.sh b/ci/install-windows.sh index 011b116754f..60d6405115e 100755 --- a/ci/install-windows.sh +++ b/ci/install-windows.sh @@ -80,27 +80,27 @@ fi if [[ "$PROJ" =~ spinnaker ]]; then echo Spinnaker install if [ "$OS" == "windows-x86_64" ]; then - if [[ $(find /c/Downloads/Spinnaker_1.27.0.48_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then + if [[ $(find /c/Downloads/Spinnaker_2.4.0.143_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then echo "Found spinnaker in cache and size seems ok" else echo "Downloading spinnaker to cache as not found" - /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1xIqjBwl3Q9GnEPcs9JdZBJNmOSWD8gRE /c/Downloads/Spinnaker_1.27.0.48_Binaries_v140_x64.msi - /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1l74LjV8rANk_P_CvXZOMSzi7J02YVkfD /c/Downloads/Spinnaker_1.27.0.48_SourceCode_v140_x64.msi + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1NiMxxDflip1F5rJuf73xhfoI9vWUeUkQ /c/Downloads/Spinnaker_2.4.0.143_Binaries_v140_x64.msi + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1FKatuVsLIQLbDb9R9W2ax_tav8_7--HI /c/Downloads/Spinnaker_2.4.0.143_SourceCode_v140_x64.msi fi # we can get these msi files by starting the installation from the exe file - cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_1.27.0.48_Binaries_v140_x64.msi ADDLOCAL=ALL' - cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_1.27.0.48_SourceCode_v140_x64.msi ADDLOCAL=ALL' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_2.4.0.143_Binaries_v140_x64.msi ADDLOCAL=ALL' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_2.4.0.143_SourceCode_v140_x64.msi ADDLOCAL=ALL' elif [ "$OS" == "windows-x86" ]; then - if [[ $(find /c/Downloads/Spinnaker_1.27.0.48_*_v140_x86.msi -type f -size +1000000c 2>/dev/null) ]]; then + if [[ $(find /c/Downloads/Spinnaker_2.4.0.143_*_v140_x86.msi -type f -size +1000000c 2>/dev/null) ]]; then echo "Found spinnaker32 in cache and size seems ok" else echo "Downloading spinnaker32 to cache as not found" - /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1kufOTKKEGXbaQemjRi8Zy2H98FkL-k6W /c/Downloads/Spinnaker_1.27.0.48_Binaries_v140_x86.msi - /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1FNweWcn-keLqvy56xqz3Ve_T3adz43rW /c/Downloads/Spinnaker_1.27.0.48_SourceCode_v140_x86.msi + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 15i6tV-vahgm_uNWT96c_KX7tFdZxmev- /c/Downloads/Spinnaker_2.4.0.143_Binaries_v140_x86.msi + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1ikOyG-gVettvjoJGQWkHxOcBWuTrGyfz /c/Downloads/Spinnaker_2.4.0.143_SourceCode_v140_x86.msi fi # we can get these msi files by starting the installation from the exe file - cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_1.27.0.48_Binaries_v140_x86.msi ADDLOCAL=ALL' - cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_1.27.0.48_SourceCode_v140_x86.msi ADDLOCAL=ALL' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_2.4.0.143_Binaries_v140_x86.msi ADDLOCAL=ALL' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_2.4.0.143_SourceCode_v140_x86.msi ADDLOCAL=ALL' fi echo "Finished spinnaker install" fi diff --git a/platform/pom.xml b/platform/pom.xml index 613cb74b105..135c706a198 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -94,7 +94,7 @@ org.bytedeco spinnaker-platform - 1.27.0.48-${project.version} + 2.4.0.143-${project.version} org.bytedeco diff --git a/spinnaker/README.md b/spinnaker/README.md index b831f57e7bf..9c093677e09 100644 --- a/spinnaker/README.md +++ b/spinnaker/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Spinnaker 1.27.0.48 https://www.flir.com/products/spinnaker-sdk + * Spinnaker 2.4.0.143 https://www.flir.com/products/spinnaker-sdk Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.spinnaker acquisition_c - 1.5.5 + 1.5.6-SNAPSHOT Acquisition_C @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco spinnaker-platform - 1.27.0.48-1.5.5 + 2.4.0.143-1.5.6-SNAPSHOT diff --git a/spinnaker/cppbuild.sh b/spinnaker/cppbuild.sh index 6784e434018..b98648fa43c 100755 --- a/spinnaker/cppbuild.sh +++ b/spinnaker/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -SPINNAKER_VERSION=1.27.0.48 +SPINNAKER_VERSION=2.4.0.143 case $PLATFORM in linux-arm*) @@ -23,14 +23,14 @@ case $PLATFORM in mv $PLATFORM/include/C/* $PLATFORM/include ;; linux-x86*) - if [[ ! -d "/usr/include/spinnaker/" ]]; then - echo "Please install Spinnaker under the default installation directory" + if [[ ! -d "/usr/include/spinnaker/" ]] && [[ ! -d "/opt/spinnaker/include/" ]]; then + echo "Please install Spinnaker under the default installation directory: /usr/include/spinnaker or /opt/spinnaker/include" exit 1 fi ;; windows-*) if [[ ! -d "/C/Program Files/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/Spinnaker/" ]] && - [[ ! -d "/C/Program Files/Point Grey Research/" ]] && [[ ! -d "/C/Program Files (x86)/Point Grey Research/" ]]; then + [[ ! -d "/C/Program Files/FLIR Systems/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/FLIR Systems/Spinnaker/" ]]; then echo "Please install Spinnaker under the default installation directory" exit 1 fi diff --git a/spinnaker/platform/pom.xml b/spinnaker/platform/pom.xml index 93c62b3977d..31571d2bce1 100644 --- a/spinnaker/platform/pom.xml +++ b/spinnaker/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco spinnaker-platform - 1.27.0.48-${project.parent.version} + 2.4.0.143-${project.parent.version} JavaCPP Presets Platform for Spinnaker diff --git a/spinnaker/pom.xml b/spinnaker/pom.xml index e334b85147f..07eb94c765f 100644 --- a/spinnaker/pom.xml +++ b/spinnaker/pom.xml @@ -11,7 +11,7 @@ org.bytedeco spinnaker - 1.27.0.48-${project.parent.version} + 2.4.0.143-${project.parent.version} JavaCPP Presets for Spinnaker diff --git a/spinnaker/samples/pom.xml b/spinnaker/samples/pom.xml index ea8b9ccbb45..2d24073bbb6 100644 --- a/spinnaker/samples/pom.xml +++ b/spinnaker/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.spinnaker acquisition_c - 1.5.5 + 1.5.6-SNAPSHOT Acquisition_C 1.7 @@ -12,7 +12,7 @@ org.bytedeco spinnaker-platform - 1.27.0.48-1.5.5 + 2.4.0.143-1.5.6-SNAPSHOT diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/actionCommandResult.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/actionCommandResult.java index 3a5d7272f23..e80650ace5c 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/actionCommandResult.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/actionCommandResult.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -29,7 +29,7 @@ public class actionCommandResult extends Pointer { return (actionCommandResult)super.position(position); } @Override public actionCommandResult getPointer(long i) { - return new actionCommandResult((Pointer)this).position(position + i); + return new actionCommandResult((Pointer)this).offsetAddress(i); } /* IP Address of device that responded to Action Command */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpin.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpin.java index 7118eb55b3b..0c152135d95 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpin.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpin.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -26,7 +26,7 @@ public class quickSpin extends Pointer { return (quickSpin)super.position(position); } @Override public quickSpin getPointer(long i) { - return new quickSpin((Pointer)this).position(position + i); + return new quickSpin((Pointer)this).offsetAddress(i); } public native @Cast("quickSpinIntegerNode") spinNodeHandle LUTIndex(); public native quickSpin LUTIndex(spinNodeHandle setter); @@ -262,6 +262,8 @@ public class quickSpin extends Pointer { public native @Cast("quickSpinIntegerNode") spinNodeHandle ChunkFrameID(); public native quickSpin ChunkFrameID(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle ChunkSerialData(); public native quickSpin ChunkSerialData(spinNodeHandle setter); public native @Cast("quickSpinFloatNode") spinNodeHandle ChunkExposureTime(); public native quickSpin ChunkExposureTime(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle ChunkCompressionMode(); public native quickSpin ChunkCompressionMode(spinNodeHandle setter); + public native @Cast("quickSpinFloatNode") spinNodeHandle ChunkCompressionRatio(); public native quickSpin ChunkCompressionRatio(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle ChunkSerialReceiveOverflow(); public native quickSpin ChunkSerialReceiveOverflow(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle ChunkTimestamp(); public native quickSpin ChunkTimestamp(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle ChunkModeActive(); public native quickSpin ChunkModeActive(spinNodeHandle setter); @@ -297,6 +299,7 @@ public class quickSpin extends Pointer { public native @Cast("quickSpinIntegerNode") spinNodeHandle Width(); public native quickSpin Width(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle TestPatternGeneratorSelector(); public native quickSpin TestPatternGeneratorSelector(spinNodeHandle setter); public native @Cast("quickSpinFloatNode") spinNodeHandle CompressionRatio(); public native quickSpin CompressionRatio(spinNodeHandle setter); + public native @Cast("quickSpinEnumerationNode") spinNodeHandle CompressionSaturationPriority(); public native quickSpin CompressionSaturationPriority(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle ReverseX(); public native quickSpin ReverseX(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle ReverseY(); public native quickSpin ReverseY(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle TestPattern(); public native quickSpin TestPattern(spinNodeHandle setter); @@ -696,6 +699,7 @@ public class quickSpin extends Pointer { public native @Cast("quickSpinCommandNode") spinNodeHandle CxpPoCxpTurnOff(); public native quickSpin CxpPoCxpTurnOff(spinNodeHandle setter); public native @Cast("quickSpinCommandNode") spinNodeHandle CxpPoCxpTripReset(); public native quickSpin CxpPoCxpTripReset(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle CxpPoCxpStatus(); public native quickSpin CxpPoCxpStatus(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle ChunkInferenceFrameId(); public native quickSpin ChunkInferenceFrameId(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle ChunkInferenceResult(); public native quickSpin ChunkInferenceResult(spinNodeHandle setter); public native @Cast("quickSpinFloatNode") spinNodeHandle ChunkInferenceConfidence(); public native quickSpin ChunkInferenceConfidence(spinNodeHandle setter); public native @Cast("quickSpinRegisterNode") spinNodeHandle ChunkInferenceBoundingBoxResult(); public native quickSpin ChunkInferenceBoundingBoxResult(spinNodeHandle setter); diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLDevice.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLDevice.java index 37553fbe157..3fb8ede6dad 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLDevice.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLDevice.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -32,7 +32,7 @@ public class quickSpinTLDevice extends Pointer { return (quickSpinTLDevice)super.position(position); } @Override public quickSpinTLDevice getPointer(long i) { - return new quickSpinTLDevice((Pointer)this).position(position + i); + return new quickSpinTLDevice((Pointer)this).offsetAddress(i); } public native @Cast("quickSpinStringNode") spinNodeHandle DeviceID(); public native quickSpinTLDevice DeviceID(spinNodeHandle setter); @@ -65,8 +65,8 @@ public class quickSpinTLDevice extends Pointer { public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceDiscoverMaximumPacketSize(); public native quickSpinTLDevice GevDeviceDiscoverMaximumPacketSize(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceMaximumPacketSize(); public native quickSpinTLDevice GevDeviceMaximumPacketSize(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle GevDeviceIsWrongSubnet(); public native quickSpinTLDevice GevDeviceIsWrongSubnet(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceAutoForceIP(); public native quickSpinTLDevice GevDeviceAutoForceIP(spinNodeHandle setter); public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceForceIP(); public native quickSpinTLDevice GevDeviceForceIP(spinNodeHandle setter); - public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceForceIPEx(); public native quickSpinTLDevice GevDeviceForceIPEx(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceIPAddress(); public native quickSpinTLDevice GevDeviceForceIPAddress(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceSubnetMask(); public native quickSpinTLDevice GevDeviceForceSubnetMask(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceGateway(); public native quickSpinTLDevice GevDeviceForceGateway(spinNodeHandle setter); @@ -76,4 +76,5 @@ public class quickSpinTLDevice extends Pointer { public native @Cast("quickSpinStringNode") spinNodeHandle DeviceLocation(); public native quickSpinTLDevice DeviceLocation(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceCurrentSpeed(); public native quickSpinTLDevice DeviceCurrentSpeed(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle DeviceU3VProtocol(); public native quickSpinTLDevice DeviceU3VProtocol(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle DevicePortId(); public native quickSpinTLDevice DevicePortId(spinNodeHandle setter); } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLInterface.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLInterface.java index d97fcfe727e..afbf050a159 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLInterface.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLInterface.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -32,15 +32,17 @@ public class quickSpinTLInterface extends Pointer { return (quickSpinTLInterface)super.position(position); } @Override public quickSpinTLInterface getPointer(long i) { - return new quickSpinTLInterface((Pointer)this).position(position + i); + return new quickSpinTLInterface((Pointer)this).offsetAddress(i); } public native @Cast("quickSpinStringNode") spinNodeHandle InterfaceID(); public native quickSpinTLInterface InterfaceID(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle InterfaceDisplayName(); public native quickSpinTLInterface InterfaceDisplayName(spinNodeHandle setter); - public native @Cast("quickSpinStringNode") spinNodeHandle InterfaceType(); public native quickSpinTLInterface InterfaceType(spinNodeHandle setter); + public native @Cast("quickSpinEnumerationNode") spinNodeHandle InterfaceType(); public native quickSpinTLInterface InterfaceType(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceGatewaySelector(); public native quickSpinTLInterface GevInterfaceGatewaySelector(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceGateway(); public native quickSpinTLInterface GevInterfaceGateway(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceMACAddress(); public native quickSpinTLInterface GevInterfaceMACAddress(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceIPAddress(); public native quickSpinTLInterface GevInterfaceIPAddress(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceSubnetSelector(); public native quickSpinTLInterface GevInterfaceSubnetSelector(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceSubnetIPAddress(); public native quickSpinTLInterface GevInterfaceSubnetIPAddress(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceSubnetMask(); public native quickSpinTLInterface GevInterfaceSubnetMask(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceTransmitLinkSpeed(); public native quickSpinTLInterface GevInterfaceTransmitLinkSpeed(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceReceiveLinkSpeed(); public native quickSpinTLInterface GevInterfaceReceiveLinkSpeed(spinNodeHandle setter); @@ -59,11 +61,12 @@ public class quickSpinTLInterface extends Pointer { public native @Cast("quickSpinStringNode") spinNodeHandle DeviceID(); public native quickSpinTLInterface DeviceID(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle DeviceVendorName(); public native quickSpinTLInterface DeviceVendorName(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle DeviceModelName(); public native quickSpinTLInterface DeviceModelName(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle DeviceSerialNumber(); public native quickSpinTLInterface DeviceSerialNumber(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceAccessStatus(); public native quickSpinTLInterface DeviceAccessStatus(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceIPAddress(); public native quickSpinTLInterface GevDeviceIPAddress(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceSubnetMask(); public native quickSpinTLInterface GevDeviceSubnetMask(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceGateway(); public native quickSpinTLInterface GevDeviceGateway(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceMACAddress(); public native quickSpinTLInterface GevDeviceMACAddress(spinNodeHandle setter); - public native @Cast("quickSpinCommandNode") spinNodeHandle AutoForceIP(); public native quickSpinTLInterface AutoForceIP(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle IncompatibleDeviceCount(); public native quickSpinTLInterface IncompatibleDeviceCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle IncompatibleDeviceSelector(); public native quickSpinTLInterface IncompatibleDeviceSelector(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle IncompatibleDeviceID(); public native quickSpinTLInterface IncompatibleDeviceID(spinNodeHandle setter); @@ -72,6 +75,11 @@ public class quickSpinTLInterface extends Pointer { public native @Cast("quickSpinIntegerNode") spinNodeHandle IncompatibleGevDeviceIPAddress(); public native quickSpinTLInterface IncompatibleGevDeviceIPAddress(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle IncompatibleGevDeviceSubnetMask(); public native quickSpinTLInterface IncompatibleGevDeviceSubnetMask(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle IncompatibleGevDeviceMACAddress(); public native quickSpinTLInterface IncompatibleGevDeviceMACAddress(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceForceIP(); public native quickSpinTLInterface GevDeviceForceIP(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceIPAddress(); public native quickSpinTLInterface GevDeviceForceIPAddress(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceSubnetMask(); public native quickSpinTLInterface GevDeviceForceSubnetMask(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceGateway(); public native quickSpinTLInterface GevDeviceForceGateway(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceAutoForceIP(); public native quickSpinTLInterface GevDeviceAutoForceIP(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterName(); public native quickSpinTLInterface HostAdapterName(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterVendor(); public native quickSpinTLInterface HostAdapterVendor(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterDriverVersion(); public native quickSpinTLInterface HostAdapterDriverVersion(spinNodeHandle setter); diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java index bb68c559939..7dfb0772dda 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -32,30 +32,35 @@ public class quickSpinTLStream extends Pointer { return (quickSpinTLStream)super.position(position); } @Override public quickSpinTLStream getPointer(long i) { - return new quickSpinTLStream((Pointer)this).position(position + i); + return new quickSpinTLStream((Pointer)this).offsetAddress(i); } public native @Cast("quickSpinStringNode") spinNodeHandle StreamID(); public native quickSpinTLStream StreamID(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle StreamType(); public native quickSpinTLStream StreamType(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamTotalBufferCount(); public native quickSpinTLStream StreamTotalBufferCount(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamDefaultBufferCount(); public native quickSpinTLStream StreamDefaultBufferCount(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamDefaultBufferCountMax(); public native quickSpinTLStream StreamDefaultBufferCountMax(spinNodeHandle setter); - public native @Cast("quickSpinEnumerationNode") spinNodeHandle StreamDefaultBufferCountMode(); public native quickSpinTLStream StreamDefaultBufferCountMode(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBufferCountManual(); public native quickSpinTLStream StreamBufferCountManual(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBufferCountResult(); public native quickSpinTLStream StreamBufferCountResult(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBufferCountMax(); public native quickSpinTLStream StreamBufferCountMax(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle StreamBufferCountMode(); public native quickSpinTLStream StreamBufferCountMode(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle StreamBufferHandlingMode(); public native quickSpinTLStream StreamBufferHandlingMode(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamAnnounceBufferMinimum(); public native quickSpinTLStream StreamAnnounceBufferMinimum(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamAnnouncedBufferCount(); public native quickSpinTLStream StreamAnnouncedBufferCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamStartedFrameCount(); public native quickSpinTLStream StreamStartedFrameCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamDeliveredFrameCount(); public native quickSpinTLStream StreamDeliveredFrameCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamLostFrameCount(); public native quickSpinTLStream StreamLostFrameCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamInputBufferCount(); public native quickSpinTLStream StreamInputBufferCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamOutputBufferCount(); public native quickSpinTLStream StreamOutputBufferCount(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle StreamCRCCheckEnable(); public native quickSpinTLStream StreamCRCCheckEnable(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle GevPacketResendMode(); public native quickSpinTLStream GevPacketResendMode(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevMaximumNumberResendRequests(); public native quickSpinTLStream GevMaximumNumberResendRequests(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevPacketResendTimeout(); public native quickSpinTLStream GevPacketResendTimeout(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle GevMaximumNumberResendBuffers(); public native quickSpinTLStream GevMaximumNumberResendBuffers(spinNodeHandle setter); + public native @Cast("quickSpinBooleanNode") spinNodeHandle StreamIsGrabbing(); public native quickSpinTLStream StreamIsGrabbing(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamChunkCountMaximum(); public native quickSpinTLStream StreamChunkCountMaximum(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBufferAlignment(); public native quickSpinTLStream StreamBufferAlignment(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamDroppedFrameCount(); public native quickSpinTLStream StreamDroppedFrameCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevTotalPacketCount(); public native quickSpinTLStream GevTotalPacketCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevFailedPacketCount(); public native quickSpinTLStream GevFailedPacketCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevResendPacketCount(); public native quickSpinTLStream GevResendPacketCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamFailedBufferCount(); public native quickSpinTLStream StreamFailedBufferCount(spinNodeHandle setter); - public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBufferUnderrunCount(); public native quickSpinTLStream StreamBufferUnderrunCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevResendRequestCount(); public native quickSpinTLStream GevResendRequestCount(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlockTransferSize(); public native quickSpinTLStream StreamBlockTransferSize(spinNodeHandle setter); } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLSystem.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLSystem.java index 59c2882298b..cdfe3b33ba4 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLSystem.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLSystem.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -32,9 +32,32 @@ public class quickSpinTLSystem extends Pointer { return (quickSpinTLSystem)super.position(position); } @Override public quickSpinTLSystem getPointer(long i) { - return new quickSpinTLSystem((Pointer)this).position(position + i); + return new quickSpinTLSystem((Pointer)this).offsetAddress(i); } + public native @Cast("quickSpinStringNode") spinNodeHandle TLID(); public native quickSpinTLSystem TLID(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLVendorName(); public native quickSpinTLSystem TLVendorName(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLModelName(); public native quickSpinTLSystem TLModelName(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLVersion(); public native quickSpinTLSystem TLVersion(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLFileName(); public native quickSpinTLSystem TLFileName(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLDisplayName(); public native quickSpinTLSystem TLDisplayName(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle TLPath(); public native quickSpinTLSystem TLPath(spinNodeHandle setter); + public native @Cast("quickSpinEnumerationNode") spinNodeHandle TLType(); public native quickSpinTLSystem TLType(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GenTLVersionMajor(); public native quickSpinTLSystem GenTLVersionMajor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GenTLVersionMinor(); public native quickSpinTLSystem GenTLVersionMinor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GenTLSFNCVersionMajor(); public native quickSpinTLSystem GenTLSFNCVersionMajor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GenTLSFNCVersionMinor(); public native quickSpinTLSystem GenTLSFNCVersionMinor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GenTLSFNCVersionSubMinor(); public native quickSpinTLSystem GenTLSFNCVersionSubMinor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevVersionMajor(); public native quickSpinTLSystem GevVersionMajor(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevVersionMinor(); public native quickSpinTLSystem GevVersionMinor(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle InterfaceUpdateList(); public native quickSpinTLSystem InterfaceUpdateList(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle InterfaceSelector(); public native quickSpinTLSystem InterfaceSelector(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle InterfaceID(); public native quickSpinTLSystem InterfaceID(spinNodeHandle setter); + public native @Cast("quickSpinStringNode") spinNodeHandle InterfaceDisplayName(); public native quickSpinTLSystem InterfaceDisplayName(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceMACAddress(); public native quickSpinTLSystem GevInterfaceMACAddress(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceDefaultIPAddress(); public native quickSpinTLSystem GevInterfaceDefaultIPAddress(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceDefaultSubnetMask(); public native quickSpinTLSystem GevInterfaceDefaultSubnetMask(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceDefaultGateway(); public native quickSpinTLSystem GevInterfaceDefaultGateway(spinNodeHandle setter); public native @Cast("quickSpinBooleanNode") spinNodeHandle EnumerateGEVInterfaces(); public native quickSpinTLSystem EnumerateGEVInterfaces(spinNodeHandle setter); - public native @Cast("quickSpinCommandNode") spinNodeHandle AutoForceIP(); public native quickSpinTLSystem AutoForceIP(spinNodeHandle setter); + public native @Cast("quickSpinBooleanNode") spinNodeHandle EnumerateUSBInterfaces(); public native quickSpinTLSystem EnumerateUSBInterfaces(spinNodeHandle setter); } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIOption.java index cbc7fefbdfd..e8491de2fd1 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinAVIOption extends Pointer { return (spinAVIOption)super.position(position); } @Override public spinAVIOption getPointer(long i) { - return new spinAVIOption((Pointer)this).position(position + i); + return new spinAVIOption((Pointer)this).offsetAddress(i); } /** Frame rate of the stream */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIRecorder.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIRecorder.java deleted file mode 100644 index 41bd70425a9..00000000000 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinAVIRecorder.java +++ /dev/null @@ -1,28 +0,0 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE - -package org.bytedeco.spinnaker.Spinnaker_C; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.spinnaker.global.Spinnaker_C.*; - - -/** - * Handle for video recording functionality. Created by calling - * spinVideoOpenUncompressed(), spinVideoOpenMJPG(), and - * spinVideoOpenH264(), which require a call to - * spinVideoClose() to destroy. - * - * Note: spinAVIRecorder is deprecated, use spinVideo instead. - */ -@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinAVIRecorder extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinAVIRecorder() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinAVIRecorder(Pointer p) { super(p); } -} diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEventFunction.java index 5839a59f464..4ac4eadb2c3 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java index e6780ca1d5c..58304526fc8 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinBMPOption extends Pointer { return (spinBMPOption)super.position(position); } @Override public spinBMPOption getPointer(long i) { - return new spinBMPOption((Pointer)this).position(position + i); + return new spinBMPOption((Pointer)this).offsetAddress(i); } public native @Cast("bool8_t") byte indexedColor_8bit(); public native spinBMPOption indexedColor_8bit(byte setter); diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCamera.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCamera.java index 03e7bbf1a40..aa3ac1998a0 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCamera.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCamera.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCameraList.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCameraList.java index e43723ee21f..fc7c4353858 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCameraList.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinCameraList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinChunkData.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinChunkData.java index 037a617dcfb..b38e7e85ad5 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinChunkData.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinChunkData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -43,12 +43,14 @@ public class spinChunkData extends Pointer { return (spinChunkData)super.position(position); } @Override public spinChunkData getPointer(long i) { - return new spinChunkData((Pointer)this).position(position + i); + return new spinChunkData((Pointer)this).offsetAddress(i); } public native double m_blackLevel(); public native spinChunkData m_blackLevel(double setter); public native @Cast("int64_t") long m_frameID(); public native spinChunkData m_frameID(long setter); public native double m_exposureTime(); public native spinChunkData m_exposureTime(double setter); + public native @Cast("int64_t") long m_compressionMode(); public native spinChunkData m_compressionMode(long setter); + public native double m_compressionRatio(); public native spinChunkData m_compressionRatio(double setter); public native @Cast("int64_t") long m_timestamp(); public native spinChunkData m_timestamp(long setter); public native @Cast("int64_t") long m_exposureEndLineStatusAll(); public native spinChunkData m_exposureEndLineStatusAll(long setter); public native @Cast("int64_t") long m_width(); public native spinChunkData m_width(long setter); @@ -80,6 +82,7 @@ public class spinChunkData extends Pointer { public native double m_scan3dAxisMax(); public native spinChunkData m_scan3dAxisMax(double setter); public native double m_scan3dTransformValue(); public native spinChunkData m_scan3dTransformValue(double setter); public native double m_scan3dCoordinateReferenceValue(); public native spinChunkData m_scan3dCoordinateReferenceValue(double setter); + public native @Cast("int64_t") long m_inferenceFrameId(); public native spinChunkData m_inferenceFrameId(long setter); public native @Cast("int64_t") long m_inferenceResult(); public native spinChunkData m_inferenceResult(long setter); public native double m_inferenceConfidence(); public native spinChunkData m_inferenceConfidence(double setter); } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java similarity index 59% rename from spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEvent.java rename to spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java index f74353fd506..83681592daa 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinArrivalEvent.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -12,14 +12,14 @@ /** - * Handle for arrival event functionality. Created by calling + * Handle for arrival event handler functionality. Created by calling * spinArrivalEventCreate(), which requires a call to - * spinArrivalEventDestroy() to destroy. + * spinDeviceArrivalEventHandlerDestroy() to destroy. */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinArrivalEvent extends Pointer { +public class spinDeviceArrivalEventHandler extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinArrivalEvent() { super((Pointer)null); } + public spinDeviceArrivalEventHandler() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinArrivalEvent(Pointer p) { super(p); } + public spinDeviceArrivalEventHandler(Pointer p) { super(p); } } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventData.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventData.java index b5151406486..227f7c44e9d 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventData.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventFunction.java index fec63202745..f0ff30ae4b1 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java similarity index 56% rename from spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEvent.java rename to spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java index e97f0224427..2e66055d067 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEvent.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -12,14 +12,14 @@ /** - * Handle for image event functionality. Created by calling - * spinImageEventCreate(), which requires a call to spinImageEventDestroy() + * Handle for device event handler functionality. Created by calling + * spinDeviceEventHandlerCreate(), which requires a call to spinDeviceEventHandlerDestroy() * to destroy. */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinImageEvent extends Pointer { +public class spinDeviceEventHandler extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinImageEvent() { super((Pointer)null); } + public spinDeviceEventHandler() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinImageEvent(Pointer p) { super(p); } + public spinDeviceEventHandler(Pointer p) { super(p); } } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceRemovalEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceRemovalEventHandler.java new file mode 100644 index 00000000000..2ac11d89e89 --- /dev/null +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceRemovalEventHandler.java @@ -0,0 +1,25 @@ +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.spinnaker.Spinnaker_C; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.spinnaker.global.Spinnaker_C.*; + + +/** + * Handle for removal event handler functionality. Created by calling + * spinDeviceRemovalEventHandlerCreate(), which requires a call to + * spinDeviceRemovalEventHandlerDestroy() to destroy. + */ +@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) +public class spinDeviceRemovalEventHandler extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public spinDeviceRemovalEventHandler() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public spinDeviceRemovalEventHandler(Pointer p) { super(p); } +} diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinH264Option.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinH264Option.java index 487c7af2ae9..30486307c2e 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinH264Option.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinH264Option.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinH264Option extends Pointer { return (spinH264Option)super.position(position); } @Override public spinH264Option getPointer(long i) { - return new spinH264Option((Pointer)this).position(position + i); + return new spinH264Option((Pointer)this).offsetAddress(i); } /** Frame rate of the stream */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImage.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImage.java index 356692ceeae..8eb5469354c 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImage.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImage.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventFunction.java index 937f76bdeb3..e3a470be4eb 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java similarity index 57% rename from spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEvent.java rename to spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java index 339f4aabd5a..b7447c9844a 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEvent.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -12,14 +12,14 @@ /** - * Handle for device event functionality. Created by calling - * spinDeviceEventCreate(), which requires a call to spinDeviceEventDestroy() + * Handle for image event handler functionality. Created by calling + * spinImageEventHandlerCreate(), which requires a call to spinImageEventHandlerDestroy() * to destroy. */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinDeviceEvent extends Pointer { +public class spinImageEventHandler extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinDeviceEvent() { super((Pointer)null); } + public spinImageEventHandler() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinDeviceEvent(Pointer p) { super(p); } + public spinImageEventHandler(Pointer p) { super(p); } } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageStatistics.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageStatistics.java index 8fd704122b4..80a2cbe9003 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageStatistics.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageStatistics.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterface.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterface.java index 6d08e689c19..2a41b8a232f 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterface.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterface.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java similarity index 54% rename from spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEvent.java rename to spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java index a8a58cad771..c732f4735c3 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEvent.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -12,14 +12,14 @@ /** - * Handle for interface event functionality. Created by calling - * spinInterfaceEventCreate(), which requires a call to - * spinInterfaceEventDestroy() to destroy. + * Handle for interface event handler functionality. Created by calling + * spinInterfaceEventHandlerCreate(), which requires a call to + * spinInterfaceEventHandlerDestroy() to destroy. */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinInterfaceEvent extends Pointer { +public class spinInterfaceEventHandler extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinInterfaceEvent() { super((Pointer)null); } + public spinInterfaceEventHandler() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinInterfaceEvent(Pointer p) { super(p); } + public spinInterfaceEventHandler(Pointer p) { super(p); } } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceList.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceList.java index f5e5424d7d5..fc56c8e682b 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceList.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPEGOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPEGOption.java index 1807fecb6f1..e1005c94945 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPEGOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPEGOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinJPEGOption extends Pointer { return (spinJPEGOption)super.position(position); } @Override public spinJPEGOption getPointer(long i) { - return new spinJPEGOption((Pointer)this).position(position + i); + return new spinJPEGOption((Pointer)this).offsetAddress(i); } /** Whether to save as a progressive JPEG file. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPG2Option.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPG2Option.java index 1398f578bb2..2dd9930e55e 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPG2Option.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinJPG2Option.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinJPG2Option extends Pointer { return (spinJPG2Option)super.position(position); } @Override public spinJPG2Option getPointer(long i) { - return new spinJPG2Option((Pointer)this).position(position + i); + return new spinJPG2Option((Pointer)this).offsetAddress(i); } /** JPEG saving quality in range (1-512). */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLibraryVersion.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLibraryVersion.java index 1917ee16804..88deb011238 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLibraryVersion.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLibraryVersion.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -29,7 +29,7 @@ public class spinLibraryVersion extends Pointer { return (spinLibraryVersion)super.position(position); } @Override public spinLibraryVersion getPointer(long i) { - return new spinLibraryVersion((Pointer)this).position(position + i); + return new spinLibraryVersion((Pointer)this).offsetAddress(i); } /** Major version of the library **/ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventData.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventData.java index ab5e8e11353..b9fdeb39c36 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventData.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventFunction.java index 0a8874dc4e6..82125fb16a2 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java similarity index 57% rename from spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEvent.java rename to spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java index fa1c9d2b831..b28e277abce 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEvent.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -12,14 +12,14 @@ /** - * Handle for logging event functionality. Created by calling - * spinLogEventCreate(), which requires a call to spinLogEventDestroy() + * Handle for logging event handler functionality. Created by calling + * spinLogEventHandlerCreate(), which requires a call to spinLogEventHandlerDestroy() * to destroy. */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinLogEvent extends Pointer { +public class spinLogEventHandler extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinLogEvent() { super((Pointer)null); } + public spinLogEventHandler() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinLogEvent(Pointer p) { super(p); } + public spinLogEventHandler(Pointer p) { super(p); } } diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinMJPGOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinMJPGOption.java index 72ce15d4151..eb4cab580cf 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinMJPGOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinMJPGOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinMJPGOption extends Pointer { return (spinMJPGOption)super.position(position); } @Override public spinMJPGOption getPointer(long i) { - return new spinMJPGOption((Pointer)this).position(position + i); + return new spinMJPGOption((Pointer)this).offsetAddress(i); } /** Frame rate of the stream */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackFunction.java index 390f306eb00..100315825c8 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackHandle.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackHandle.java index f4d6c6b6152..0d324a52ba6 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackHandle.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeCallbackHandle.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeHandle.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeHandle.java index 161023aff14..5fb7574fb81 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeHandle.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeHandle.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeMapHandle.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeMapHandle.java index c46af573c6d..72765f708a4 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeMapHandle.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinNodeMapHandle.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPGMOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPGMOption.java index 4b3f4f1512b..611f62b008e 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPGMOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPGMOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -27,7 +27,7 @@ public class spinPGMOption extends Pointer { return (spinPGMOption)super.position(position); } @Override public spinPGMOption getPointer(long i) { - return new spinPGMOption((Pointer)this).position(position + i); + return new spinPGMOption((Pointer)this).offsetAddress(i); } /** Whether to save the PPM as a binary file. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPNGOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPNGOption.java index 00352856edb..73eef776bac 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPNGOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPNGOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -39,7 +39,7 @@ public class spinPNGOption extends Pointer { return (spinPNGOption)super.position(position); } @Override public spinPNGOption getPointer(long i) { - return new spinPNGOption((Pointer)this).position(position + i); + return new spinPNGOption((Pointer)this).offsetAddress(i); } /** Whether to save the PNG as interlaced. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPPMOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPPMOption.java index 0b05bddd9f0..d4529bebdb9 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPPMOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinPPMOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinPPMOption extends Pointer { return (spinPPMOption)super.position(position); } @Override public spinPPMOption getPointer(long i) { - return new spinPPMOption((Pointer)this).position(position + i); + return new spinPPMOption((Pointer)this).offsetAddress(i); } /** Whether to save the PPM as a binary file. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEvent.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEvent.java deleted file mode 100644 index 3f1e866964e..00000000000 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE - -package org.bytedeco.spinnaker.Spinnaker_C; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.spinnaker.global.Spinnaker_C.*; - - -/** - * Handle for removal event functionality. Created by calling - * spinRemovalEventCreate(), which requires a call to - * spinRemovalEventDestroy() to destroy. - */ -@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) -public class spinRemovalEvent extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public spinRemovalEvent() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public spinRemovalEvent(Pointer p) { super(p); } -} diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEventFunction.java index ed55c903a91..c810ee2e00e 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinRemovalEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java index 753ca52d7c2..8ab4cf21250 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinTIFFOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinTIFFOption.java index 75f37509c20..deb2ec06991 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinTIFFOption.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinTIFFOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -30,7 +30,7 @@ public class spinTIFFOption extends Pointer { return (spinTIFFOption)super.position(position); } @Override public spinTIFFOption getPointer(long i) { - return new spinTIFFOption((Pointer)this).position(position + i); + return new spinTIFFOption((Pointer)this).offsetAddress(i); } /** Compression method to use for encoding TIFF images. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinVideo.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinVideo.java index 0600213b595..9b9e211a637 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinVideo.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinVideo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -10,6 +10,13 @@ import static org.bytedeco.spinnaker.global.Spinnaker_C.*; + +/** + * Handle for video recording functionality. Created by calling + * spinVideoOpenUncompressed(), spinVideoOpenMJPG(), and + * spinVideoOpenH264(), which require a call to + * spinVideoClose() to destroy. + */ @Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) public class spinVideo extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/global/Spinnaker_C.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/global/Spinnaker_C.java index a87c8acbaeb..a22490cab82 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/global/Spinnaker_C.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/global/Spinnaker_C.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.global; @@ -16,7 +16,7 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -123,7 +123,7 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -180,22 +180,22 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C { // Targeting ../Spinnaker_C/spinImageStatistics.java -// Targeting ../Spinnaker_C/spinDeviceEvent.java +// Targeting ../Spinnaker_C/spinDeviceEventHandler.java -// Targeting ../Spinnaker_C/spinImageEvent.java +// Targeting ../Spinnaker_C/spinImageEventHandler.java -// Targeting ../Spinnaker_C/spinArrivalEvent.java +// Targeting ../Spinnaker_C/spinDeviceArrivalEventHandler.java -// Targeting ../Spinnaker_C/spinRemovalEvent.java +// Targeting ../Spinnaker_C/spinDeviceRemovalEventHandler.java -// Targeting ../Spinnaker_C/spinInterfaceEvent.java +// Targeting ../Spinnaker_C/spinInterfaceEventHandler.java -// Targeting ../Spinnaker_C/spinLogEvent.java +// Targeting ../Spinnaker_C/spinLogEventHandler.java // Targeting ../Spinnaker_C/spinLogEventData.java @@ -204,9 +204,6 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C { // Targeting ../Spinnaker_C/spinDeviceEventData.java -// Targeting ../Spinnaker_C/spinAVIRecorder.java - - // Targeting ../Spinnaker_C/spinVideo.java @@ -446,26 +443,29 @@ public enum _spinImageStatus { IMAGE_CRC_CHECK_FAILED(1), /** Received more data than the size of the image. */ IMAGE_DATA_OVERFLOW(2), - /** Image has missing packets */ + /** Image has missing packets. Potential fixes include enabling + jumbo packets and adjusting packet size/delay. For more information see + https://www.flir.com/support-center/iis/machine-vision/application-note/troubleshooting-image-consistency-errors/ + */ IMAGE_MISSING_PACKETS(3), - /** Image leader is incomplete. */ + /** Image leader is incomplete. Could be caused by missing packet(s). See link above.*/ IMAGE_LEADER_BUFFER_SIZE_INCONSISTENT(4), - /** Image trailer is incomplete. */ + /** Image trailer is incomplete. Could be caused by missing packet(s). See link above.*/ IMAGE_TRAILER_BUFFER_SIZE_INCONSISTENT(5), - /** Image has an inconsistent packet id. */ + /** Image has an inconsistent packet id. Could be caused by missing packet(s). See link above.*/ IMAGE_PACKETID_INCONSISTENT(6), - /** Image leader is missing. */ + /** Image leader is missing. Could be caused by missing packet(s). See link above.*/ IMAGE_MISSING_LEADER(7), - /** Image trailer is missing. */ + /** Image trailer is missing. Could be caused by missing packet(s). See link above.*/ IMAGE_MISSING_TRAILER(8), - /** Image data is incomplete. */ + /** Image data is incomplete. Could be caused by missing packet(s). See link above.*/ IMAGE_DATA_INCOMPLETE(9), - /** Image info is corrupted. */ + /** Image info is corrupted. Could be caused by missing packet(s). See link above.*/ IMAGE_INFO_INCONSISTENT(10), /** Image chunk data is invalid */ IMAGE_CHUNK_DATA_INVALID(11), /** Image cannot be processed due to lack of system - resources. */ + resources. */ IMAGE_NO_SYSTEM_RESOURCES(12); public final int value; @@ -512,7 +512,12 @@ public enum _spinPayloadTypeInfoIDs { PAYLOAD_TYPE_MULTI_PART(10), /* GenTL v1.5 */ PAYLOAD_TYPE_CUSTOM_ID(1000), /* Starting value for GenTL Producer custom IDs. */ - PAYLOAD_TYPE_EXTENDED_CHUNK(1001); + PAYLOAD_TYPE_EXTENDED_CHUNK(1001), + PAYLOAD_TYPE_LOSSLESS_COMPRESSED(1002), + PAYLOAD_TYPE_LOSSY_COMPRESSED(1003), + PAYLOAD_TYPE_JPEG_LOSSLESS_COMPRESSED(1004), + PAYLOAD_TYPE_CHUNK_DATA_LOSSLESS_COMPRESSED(1005), + PAYLOAD_TYPE_CHUNK_DATA_LOSSY_COMPRESSED(1006); public final int value; private _spinPayloadTypeInfoIDs(int v) { this.value = v; } @@ -625,7 +630,7 @@ public enum _actionCommandStatus { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -640,7 +645,7 @@ public enum _actionCommandStatus { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #ifndef FLIR_SPINNAKER_CAMERA_DEFS_C_H @@ -2008,6 +2013,20 @@ public enum _spinTestPatternGeneratorSelectorEnums { @Override public String toString() { return intern().name(); } } +public enum _spinCompressionSaturationPriorityEnums { + /** Frames which will cause the MaxDatarateThreshold to be exceeded will not be transmitted. Requires FrameRateEnable to be True*/ + CompressionSaturationPriority_DropFrame(0), + /** AcquisitionFrameRate is dynamically adjusted to the highest possible value without exceeding the MaxDatarateThreshold.*/ + CompressionSaturationPriority_ReduceFrameRate(1), + NUM_COMPRESSIONSATURATIONPRIORITY(2); + + public final int value; + private _spinCompressionSaturationPriorityEnums(int v) { this.value = v; } + private _spinCompressionSaturationPriorityEnums(_spinCompressionSaturationPriorityEnums e) { this.value = e.value; } + public _spinCompressionSaturationPriorityEnums intern() { for (_spinCompressionSaturationPriorityEnums e : values()) if (e.value == value) return e; return this; } + @Override public String toString() { return intern().name(); } +} + public enum _spinTestPatternEnums { /** Test pattern is disabled.*/ TestPattern_Off(0), @@ -5517,7 +5536,7 @@ public enum _spinCxpPoCxpStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -5532,7 +5551,7 @@ public enum _spinCxpPoCxpStatusEnums { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #ifndef FLIR_SPINNAKER_CHUNKDATADEF_C_H @@ -5552,7 +5571,7 @@ public enum _spinCxpPoCxpStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -5890,7 +5909,7 @@ public enum _spinInputDirection { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -5906,8 +5925,8 @@ public enum _spinInputDirection { // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= -// #ifndef PGR_SPINNAKER_GENAPI_C_H_ -// #define PGR_SPINNAKER_GENAPI_C_H_ +// #ifndef FLIR_SPINNAKER_GENAPI_C_H_ +// #define FLIR_SPINNAKER_GENAPI_C_H_ // #include "SpinnakerGenApiDefsC.h" // #include "SpinnakerDefsC.h" @@ -5966,6 +5985,21 @@ public enum _spinInputDirection { */ public static native _spinError spinNodeMapGetNodeByIndex(spinNodeMapHandle hNodeMap, @Cast("size_t") long index, @ByPtrPtr spinNodeHandle phNode); + /** + * Releases the entry node handle. + * Make sure node handle is cleaned up properly by setting it to NULL after the node is released. + * If this function is not explicitly called, the handle will be released upon the release of the + * camera handle. + * @see spinCameraRelease + * @see spinError + * + * @param hNodeMap The node map from which the node handle is retrieved + * @param hNode The node handle to be released + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinNodeMapReleaseNode(spinNodeMapHandle hNodeMap, spinNodeHandle hNode); + /** * Fires nodes which have a polling time * @see spinError @@ -6645,49 +6679,64 @@ public static native _spinError spinNodeRegisterCallback( * Retrieves the number of entries of an enum node * @see spinError * - * @param hNode The enum node where the entries to be counted are + * @param hEnumNode The enum node where the entries to be counted are * @param pValue The unsigned integer pointer in which the number of entries is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationGetNumEntries(spinNodeHandle hNode, @Cast("size_t*") SizeTPointer pValue); + public static native _spinError spinEnumerationGetNumEntries(spinNodeHandle hEnumNode, @Cast("size_t*") SizeTPointer pValue); /** * Retrieves an entry node from an enum node using an index * @see spinError * - * @param hNode The enum node from which the entry node is retrieved + * @param hEnumNode The enum node from which the entry node is retrieved * @param index The index of the entry node * @param phEntry The node handle pointer in which the entry node is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationGetEntryByIndex(spinNodeHandle hNode, @Cast("size_t") long index, @ByPtrPtr spinNodeHandle phEntry); + public static native _spinError spinEnumerationGetEntryByIndex(spinNodeHandle hEnumNode, @Cast("size_t") long index, @ByPtrPtr spinNodeHandle phEntry); /** * Retrieves an entry node from an enum node using the entry's symbolic * @see spinError * - * @param hNode The enum node from which the entry node is retrieved + * @param hEnumNode The enum node from which the entry node is retrieved * @param pName The name of the entry node * @param phEntry The node handle pointer in which the entry node is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationGetEntryByName(spinNodeHandle hNode, @Cast("const char*") BytePointer pName, @ByPtrPtr spinNodeHandle phEntry); - public static native @Cast("_spinError") int spinEnumerationGetEntryByName(spinNodeHandle hNode, String pName, @ByPtrPtr spinNodeHandle phEntry); + public static native _spinError spinEnumerationGetEntryByName(spinNodeHandle hEnumNode, @Cast("const char*") BytePointer pName, @ByPtrPtr spinNodeHandle phEntry); + public static native @Cast("_spinError") int spinEnumerationGetEntryByName(spinNodeHandle hEnumNode, String pName, @ByPtrPtr spinNodeHandle phEntry); /** * Retrieves the currently selected entry node from an enum node * @see spinError * - * @param hNode The enum node from which the current entry node is retrieved + * @param hEnumNode The enum node from which the current entry node is retrieved * @param phEntry The node handle pointer in which the current entry node is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationGetCurrentEntry(spinNodeHandle hNode, @ByPtrPtr spinNodeHandle phEntry); + public static native _spinError spinEnumerationGetCurrentEntry(spinNodeHandle hEnumNode, @ByPtrPtr spinNodeHandle phEntry); + /** + * Releases the entry node from the enum node handle. + * Make sure node handle is cleaned up properly by setting it to NULL after the node is released + * If this function is not explicitly called, the handle will be released upon the release of the + * camera handle. + * @see spinCameraRelease + * @see spinError + * + * @param hEnumNode The enum node from which the current entry node is retrieved + * @param hEntry The entry node handle to be released + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinEnumerationReleaseNode(spinNodeHandle hEnumNode, spinNodeHandle hEntry); + /** * Sets a new entry using its integer value retrieved from a call to spinEnumerationEntryGetIntValue(); note that * enumeration entry int and enum values are different - int values defined on camera, enum values found in @@ -6695,13 +6744,13 @@ public static native _spinError spinNodeRegisterCallback( * @see spinEnumerationEntryGetIntValue() * @see spinError * - * @param hNode The enum node having its entry changed + * @param hEnumNode The enum node having its entry changed * @param value The integer value of the entry node to set; this corresponds to the integer value internal to the * camera * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationSetIntValue(spinNodeHandle hNode, @Cast("int64_t") long value); + public static native _spinError spinEnumerationSetIntValue(spinNodeHandle hEnumNode, @Cast("int64_t") long value); /** * Sets a new entry using its enum; note that enumeration entry int and enum values are different - int values @@ -6709,13 +6758,13 @@ public static native _spinError spinNodeRegisterCallback( * @see spinEnumerationEntryGetEnumValue() * @see spinError * - * @param hNode The enum node have its entry changed + * @param hEnumNode The enum node have its entry changed * @param value The enum value of the entry node to set; this corresponds to its integer value created in the * library * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinEnumerationSetEnumValue(spinNodeHandle hNode, @Cast("size_t") long value); + public static native _spinError spinEnumerationSetEnumValue(spinNodeHandle hEnumNode, @Cast("size_t") long value); /*@}*/ /** @@ -6852,26 +6901,41 @@ public static native _spinError spinNodeRegisterCallback( * Retrieves the number of a features (or child nodes) or a category node * @see spinError * - * @param hNode The category node where the features to be counted are + * @param hCategoryNode The category node where the features to be counted are * @param pValue The unsigned integer pointer in which the number of features is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCategoryGetNumFeatures(spinNodeHandle hNode, @Cast("size_t*") SizeTPointer pValue); + public static native _spinError spinCategoryGetNumFeatures(spinNodeHandle hCategoryNode, @Cast("size_t*") SizeTPointer pValue); /** * Retrieves a node from a category node using an index * @see spinError * - * @param hNode The category node of the node to retrieve + * @param hCategoryNode The category node of the node to retrieve * @param index The index of the feature node * @param phFeature The node handle pointer in which the feature node is returned * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCategoryGetFeatureByIndex(spinNodeHandle hNode, @Cast("size_t") long index, @ByPtrPtr spinNodeHandle phFeature); + public static native _spinError spinCategoryGetFeatureByIndex(spinNodeHandle hCategoryNode, @Cast("size_t") long index, @ByPtrPtr spinNodeHandle phFeature); /*@}*/ + /** + * Releases the feature node from the category node. + * Make sure node handle is cleaned up properly by setting it to NULL after the node is released + * If this function is not explicitly called, the handle will be released upon the release of the + * camera handle. + * @see spinCameraRelease + * @see spinError + * + * @param hCategoryNode The category node handle from which the feature node is retrieved + * @param hFeature The feature node handle to be released + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinCategoryReleaseNode(spinNodeHandle hCategoryNode, spinNodeHandle hFeature); + /** * \defgroup CIRegister IRegister Access * @@ -6990,6 +7054,7 @@ public static native _spinError spinRegisterGetEx( * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ public static native _spinError spinRegisterSetReference(spinNodeHandle hNode, spinNodeHandle hRef); + /*@}*/ // #ifdef __cplusplus @@ -6997,12 +7062,13 @@ public static native _spinError spinRegisterGetEx( /*@}*/ -// #endif /* PGR_SPINNAKER_GENAPI_C_H_ */ +// #endif /* FLIR_SPINNAKER_GENAPI_C_H_ */ + // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -7284,36 +7350,36 @@ public static native _spinError spinSystemGetCamerasEx( public static native _spinError spinSystemGetLoggingLevel(spinSystem hSystem, @Cast("spinnakerLogLevel*") int[] pLogLevel); /** - * Registers a logging event to the system (events registered in this way must be unregistered) + * Registers a logging event handler to the system (event handlers registered in this way must be unregistered) * @see spinError * - * @param hSystem The system, on which the logging event is registered - * @param hLogEvent The logging event to register on the system + * @param hSystem The system, on which the logging event handler is registered + * @param hLogEventHandler The logging event handler to register on the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemRegisterLogEvent(spinSystem hSystem, spinLogEvent hLogEvent); + public static native _spinError spinSystemRegisterLogEventHandler(spinSystem hSystem, spinLogEventHandler hLogEventHandler); /** - * Unregisters a selected logging event from the system + * Unregisters a selected logging event handler from the system * @see spinError * - * @param hSystem The system, from which the logging event is unregistered - * @param hLogEvent The logging event to unregister from the system + * @param hSystem The system, from which the logging event handler is unregistered + * @param hLogEventHandler The logging event handler to unregister from the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemUnregisterLogEvent(spinSystem hSystem, spinLogEvent hLogEvent); + public static native _spinError spinSystemUnregisterLogEventHandler(spinSystem hSystem, spinLogEventHandler hLogEventHandler); /** - * Unregisters all logging events from the system + * Unregisters all logging event handlers from the system * @see spinError * - * @param hSystem The system, from which all logging events are unregistered + * @param hSystem The system, from which all logging event handlers are unregistered * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemUnregisterAllLogEvents(spinSystem hSystem); + public static native _spinError spinSystemUnregisterAllLogEventHandlers(spinSystem hSystem); /** * Checks whether a system is currently in use @@ -7329,72 +7395,93 @@ public static native _spinError spinSystemGetCamerasEx( public static native _spinError spinSystemIsInUse(spinSystem hSystem, @Cast("bool8_t*") byte[] pbIsInUse); /** - * Registers an arrival event to every interface on the system (events registered this way must be unregistered) + * Registers a device arrival event handler to every interface on the system (event handlers registered this way + * must be unregistered) * @see spinError * - * @param hSystem The system, on which the arrival event is registered - * @param hArrivalEvent The arrival event to register on the system + * @param hSystem The system, on which the device arrival event handler is registered + * @param hDeviceArrivalEventHandler The device arrival event handler to register on the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemRegisterArrivalEvent(spinSystem hSystem, spinArrivalEvent hArrivalEvent); + public static native _spinError spinSystemRegisterDeviceArrivalEventHandler( + spinSystem hSystem, + spinDeviceArrivalEventHandler hDeviceArrivalEventHandler); /** - * Registers a removal event to the system to every interface on the system (events registered this way must be - * unregistered) + * Registers a device removal event handler to the system to every interface on the system (event handlers + * registered this way must be unregistered) * @see spinError * - * @param hSystem The system, on which the removal event is registered - * @param hRemovalEvent The removal event to register on the system + * @param hSystem The system, on which the device removal event handler is registered + * @param hDeviceRemovalEventHandler The device removal event handler to register on the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemRegisterRemovalEvent(spinSystem hSystem, spinRemovalEvent hRemovalEvent); + public static native _spinError spinSystemRegisterDeviceRemovalEventHandler( + spinSystem hSystem, + spinDeviceRemovalEventHandler hDeviceRemovalEventHandler); /** - * Unregisters an arrival event from the system + * Unregisters a device arrival event handler from the system * @see spinError + * @see spinDeviceArrivalEventHandler * - * @param hSystem The system, from which the arrival event is unregistered - * @param hArrivalEvent The arrival event to unregister from the system + * @param hSystem The system, from which the device arrival event handler is unregistered + * @param hDeviceArrivalEventHandler The device arrival event handler to unregister from the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemUnregisterArrivalEvent(spinSystem hSystem, spinArrivalEvent hArrivalEvent); + public static native _spinError spinSystemUnregisterDeviceArrivalEventHandler( + spinSystem hSystem, + spinDeviceArrivalEventHandler hDeviceArrivalEventHandler); /** - * Unregisters a removal event from the system + * Unregisters a device removal event handler from the system * @see spinError + * @see spinDeviceRemovalEventHandler * - * @param hSystem The system, from which the removal event is unregistered - * @param hRemovalEvent The removal event to unregister from the system + * @param hSystem The system, from which the device removal event handler is unregistered + * @param hDeviceRemovalEventHandler The device removal event handler to unregister from the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemUnregisterRemovalEvent(spinSystem hSystem, spinRemovalEvent hRemovalEvent); + public static native _spinError spinSystemUnregisterDeviceRemovalEventHandler( + spinSystem hSystem, + spinDeviceRemovalEventHandler hDeviceRemovalEventHandler); /** - * Registers an interface event (arrival and removal) to every interface on the system (interface events registered - * this way must be unregistered) + * Registers an interface event handler (device arrival and device removal) to every interface on the system + * (interface events registered this way must be unregistered) + * If new interfaces are detected by the system after spinSystemRegisterInterfaceEventHandler() is called, those + * interfaces will be automatically registered with this event. * @see spinError + * @see spinInterfaceEventHandler * - * @param hSystem The system, on which the interface event is registered - * @param hInterfaceEvent The interface event (arrival and removal) to register on the system + * @param hSystem The system, on which the interface event handler is registered + * @param hInterfaceEventHandler The interface event handler (device arrival and device removal) to register on the + * system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemRegisterInterfaceEvent(spinSystem hSystem, spinInterfaceEvent hInterfaceEvent); + public static native _spinError spinSystemRegisterInterfaceEventHandler( + spinSystem hSystem, + spinInterfaceEventHandler hInterfaceEventHandler); /** - * Unregisters an interface event from the system + * Unregisters an interface event handler from the system * @see spinError + * @see spinInterfaceEventHandler * - * @param hSystem The system, from which the interface event is unregistered - * @param hInterfaceEvent The interface event (arrival and removal) to unregister from the system + * @param hSystem The system, from which the interface event handler is unregistered + * @param hInterfaceEventHandler The interface event handler (device arrival and device removal) to unregister from + * the system * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemUnregisterInterfaceEvent(spinSystem hSystem, spinInterfaceEvent hInterfaceEvent); + public static native _spinError spinSystemUnregisterInterfaceEventHandler( + spinSystem hSystem, + spinInterfaceEventHandler hInterfaceEventHandler); /** * Updates the list of cameras on the system, informing whether there has been any changes @@ -7443,14 +7530,7 @@ public static native _spinError spinSystemGetCamerasEx( * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinSystemSendActionCommand( - spinSystem hSystem, - @Cast("size_t") long iDeviceKey, - @Cast("size_t") long iGroupKey, - @Cast("size_t") long iGroupMask, - @Cast("size_t") long iActionTime, - @Cast("size_t*") SizeTPointer piResultSize, - actionCommandResult results); + /** * Get current library version of Spinnaker. @@ -7653,7 +7733,7 @@ public static native _spinError spinSystemSendActionCommand( * * \brief The functions in this section provide access to information, * objects, and functionality of interfaces. This includes camera list - * and nodemap retrieval, event registration, and interface release. + * and nodemap retrieval, event handler registration, and interface release. */ /*@{*/ @@ -7717,70 +7797,84 @@ public static native _spinError spinInterfaceGetCamerasEx( public static native _spinError spinInterfaceGetTLNodeMap(spinInterface hInterface, @ByPtrPtr spinNodeMapHandle phNodeMap); /** - * Registers an arrival event on an interface (events registered in this way must be unregistered) + * Registers a device arrival event handler on an interface (event handlers registered in this way must be + * unregistered) * @see spinError * - * @param hInterface The interface on which to register the arrival event - * @param hArrivalEvent The arrival event to register + * @param hInterface The interface on which to register the device arrival event handler + * @param hDeviceArrivalEventHandler The device arrival event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceRegisterArrivalEvent(spinInterface hInterface, spinArrivalEvent hArrivalEvent); + public static native _spinError spinInterfaceRegisterDeviceArrivalEventHandler( + spinInterface hInterface, + spinDeviceArrivalEventHandler hDeviceArrivalEventHandler); /** - * Registers a removal event on an interface (events registered in this way must be unregistered) + * Registers a device removal event handler on an interface (event handlers registered in this way must be + * unregistered) * @see spinError * - * @param hInterface the Interface on which to register the removal event - * @param hRemovalEvent The removal event to register + * @param hInterface the Interface on which to register the device removal event handler + * @param hDeviceRemovalEventHandler The device removal event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceRegisterRemovalEvent(spinInterface hInterface, spinRemovalEvent hRemovalEvent); + public static native _spinError spinInterfaceRegisterDeviceRemovalEventHandler( + spinInterface hInterface, + spinDeviceRemovalEventHandler hDeviceRemovalEventHandler); /** - * Unregisters an arrival event from an interface + * Unregisters a device arrival event handler from an interface * @see spinError * - * @param hInterface The interface from which to unregister the arrival event - * @param hArrivalEvent The arrival event to unregister + * @param hInterface The interface from which to unregister the device arrival event handler + * @param hDeviceArrivalEventHandler The device arrival event handler to unregister * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceUnregisterArrivalEvent(spinInterface hInterface, spinArrivalEvent hArrivalEvent); + public static native _spinError spinInterfaceUnregisterDeviceArrivalEventHandler( + spinInterface hInterface, + spinDeviceArrivalEventHandler hDeviceArrivalEventHandler); /** - * Unregisters a removal event from an interface + * Unregisters a device removal event handler from an interface * @see spinError * - * @param hInterface The interface from which to unregister the removal event - * @param hRemovalEvent The removal event to unregister + * @param hInterface The interface from which to unregister the device removal event handler + * @param hDeviceRemovalEventHandler The device removal event handler to unregister * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceUnregisterRemovalEvent(spinInterface hInterface, spinRemovalEvent hRemovalEvent); + public static native _spinError spinInterfaceUnregisterDeviceRemovalEventHandler( + spinInterface hInterface, + spinDeviceRemovalEventHandler hDeviceRemovalEventHandler); /** - * Registers an interface event (both arrival and removal) on an interface + * Registers an interface event handler (both device arrival and device removal) on an interface * @see spinError * - * @param hInterface The interface on which to register the interface event - * @param hInterfaceEvent The interface event to register + * @param hInterface The interface on which to register the interface event handler + * @param hInterfaceEventHandler The interface event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceRegisterInterfaceEvent(spinInterface hInterface, spinInterfaceEvent hInterfaceEvent); + public static native _spinError spinInterfaceRegisterInterfaceEventHandler( + spinInterface hInterface, + spinInterfaceEventHandler hInterfaceEventHandler); /** - * Unregisters an interface event from an interface + * Unregisters an interface event handler from an interface * @see spinError * - * @param hInterface The interface from which to unregister the interface event - * @param hInterfaceEvent The interface event to unregister + * @param hInterface The interface from which to unregister the interface event handler + * @param hInterfaceEventHandler The interface event handler to unregister * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceUnregisterInterfaceEvent(spinInterface hInterface, spinInterfaceEvent hInterfaceEvent); + public static native _spinError spinInterfaceUnregisterInterfaceEventHandler( + spinInterface hInterface, + spinInterfaceEventHandler hInterfaceEventHandler); /** * Releases an interface @@ -7823,14 +7917,7 @@ public static native _spinError spinInterfaceGetCamerasEx( * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceSendActionCommand( - spinInterface hInterface, - @Cast("size_t") long iDeviceKey, - @Cast("size_t") long iGroupKey, - @Cast("size_t") long iGroupMask, - @Cast("size_t") long iActionTime, - @Cast("size_t*") SizeTPointer piResultSize, - actionCommandResult results); + /*@}*/ /** @@ -7838,7 +7925,7 @@ public static native _spinError spinInterfaceSendActionCommand( * * \brief The functions in this section provide access to information, * objects, and functionality of cameras. This includes nodemap retrieval, - * acquisition and init commands, event registration, and camera property + * acquisition and init commands, event handler registration, and camera property * retrieval. */ /*@{*/ @@ -8033,61 +8120,69 @@ public static native _spinError spinInterfaceSendActionCommand( public static native _spinError spinCameraGetGuiXml(spinCamera hCamera, @Cast("char*") byte[] pBuf, @Cast("size_t*") SizeTPointer pBufLen); /** - * Registers a universal device event (every device event type) to a camera + * Registers a universal device event handler (every device event type) to a camera * @see spinError * - * @param hCamera The camera on which to register the universal device event - * @param hDeviceEvent The device event to register + * @param hCamera The camera on which to register the universal device event handler + * @param hDeviceEventHandler The device event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCameraRegisterDeviceEvent(spinCamera hCamera, spinDeviceEvent hDeviceEvent); + public static native _spinError spinCameraRegisterDeviceEventHandler(spinCamera hCamera, spinDeviceEventHandler hDeviceEventHandler); /** - * Registers a specific device event (only one device event type) to a camera + * Registers a specific device event handler (only one device event type) to a camera * @see spinError * - * @param hCamera The camera on which to register the specific device event - * @param hDeviceEvent The device event to register - * @param pName The name of the device event to register + * @param hCamera The camera on which to register the specific device event handler + * @param hDeviceEventHandler The device event handler to register + * @param pName The name of the device event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCameraRegisterDeviceEventEx(spinCamera hCamera, spinDeviceEvent hDeviceEvent, @Cast("const char*") BytePointer pName); - public static native @Cast("_spinError") int spinCameraRegisterDeviceEventEx(spinCamera hCamera, spinDeviceEvent hDeviceEvent, String pName); + public static native _spinError spinCameraRegisterDeviceEventHandlerEx( + spinCamera hCamera, + spinDeviceEventHandler hDeviceEventHandler, + @Cast("const char*") BytePointer pName); + public static native @Cast("_spinError") int spinCameraRegisterDeviceEventHandlerEx( + spinCamera hCamera, + spinDeviceEventHandler hDeviceEventHandler, + String pName); /** - * Unregisters a device event from a camera + * Unregisters a device event handler from a camera * @see spinError * - * @param hCamera The camera from which to unregister the device event - * @param hDeviceEvent The device event to unregister + * @param hCamera The camera from which to unregister the device event handler + * @param hDeviceEventHandler The device event handler to unregister * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCameraUnregisterDeviceEvent(spinCamera hCamera, spinDeviceEvent hDeviceEvent); + public static native _spinError spinCameraUnregisterDeviceEventHandler( + spinCamera hCamera, + spinDeviceEventHandler hDeviceEventHandler); /** - * Registers an image event to a camera + * Registers an image event handler to a camera * @see spinError * - * @param hCamera The camera on which to register the image event - * @param hImageEvent The image event to register + * @param hCamera The camera on which to register the image event handler + * @param hImageEventHandler The image event handler to register * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCameraRegisterImageEvent(spinCamera hCamera, spinImageEvent hImageEvent); + public static native _spinError spinCameraRegisterImageEventHandler(spinCamera hCamera, spinImageEventHandler hImageEventHandler); /** - * Unregisters an image event from a camera + * Unregisters an image event handler from a camera * @see spinError * - * @param hCamera The camera from which to unregister the image event - * @param hImageEvent The image event to unregister + * @param hCamera The camera from which to unregister the image event handler + * @param hImageEventHandler The image event handler to unregister * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinCameraUnregisterImageEvent(spinCamera hCamera, spinImageEvent hImageEvent); + public static native _spinError spinCameraUnregisterImageEventHandler(spinCamera hCamera, spinImageEventHandler hImageEventHandler); /** * Releases a camera @@ -8208,6 +8303,37 @@ public static native _spinError spinImageCreateEx( @Cast("spinPixelFormatEnums") int pixelFormat, Pointer pData); + /** + * Creates an image with some set properties; + * images created this way must be destroyed + * + * @see spinError + * @see spinImageGetTLPayloadType + * + * @param phImage The image handle pointer in which the image is returned + * @param width The width to set + * @param height The height to set + * @param offsetX The offset along the X axis to set + * @param offsetY The offset along the Y axis to set + * @param pixelFormat The pixel format to set + * @param pData The image data to set; can be set to null + * @param dataPayloadType The payload type of the data. + This value can be retrieved from an existing image by using the spinImageGetTLPayloadType() function call. + * @param dataSize The size of the provided data in bytes + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinImageCreateEx2( + @ByPtrPtr spinImage phImage, + @Cast("size_t") long width, + @Cast("size_t") long height, + @Cast("size_t") long offsetX, + @Cast("size_t") long offsetY, + @Cast("spinPixelFormatEnums") int pixelFormat, + Pointer pData, + @Cast("spinPayloadTypeInfoIDs") int dataPayloadType, + @Cast("size_t") long dataSize); + /** * Destroys an image * @see spinError @@ -8253,6 +8379,33 @@ public static native _spinError spinImageCreateEx( public static native @Cast("_spinError") int spinImageGetColorProcessing(spinImage hImage, @Cast("spinColorProcessingAlgorithm*") IntBuffer pAlgorithm); public static native _spinError spinImageGetColorProcessing(spinImage hImage, @Cast("spinColorProcessingAlgorithm*") int[] pAlgorithm); + /** + * Sets the default number of threads used for image decompression during + * spinImageConvert(). The number of threads used is defaulted to be equal + * to one less than the number of concurrent threads supported by the + * system. + * + * @param numThreads Number of parallel image decompression threads set to run + * + * @see spinImageConvert() + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinImageSetNumDecompressionThreads(@Cast("unsigned int") int numThreads); + + /** + * Gets the number of threads used for image decompression during Convert(). + * + * @param pNumThreads The pointer indicating the number of parallel image decompression threads set to run + * + * @see spinImageSetNumDecompressionThreads() + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native _spinError spinImageGetNumDecompressionThreads(@Cast("unsigned int*") IntPointer pNumThreads); + public static native @Cast("_spinError") int spinImageGetNumDecompressionThreads(@Cast("unsigned int*") IntBuffer pNumThreads); + public static native _spinError spinImageGetNumDecompressionThreads(@Cast("unsigned int*") int[] pNumThreads); + /** * Converts the pixel format of one image into a new image * @see spinError @@ -8838,88 +8991,90 @@ public static native _spinError spinImageGetTLPixelFormatNamespace( /*@{*/ /** - * Creates a device event + * Creates a device event handler * @see spinError * - * @param phDeviceEvent The device event handle pointer in which the device event context is created + * @param phDeviceEventHandler The device event handler pointer in which the device event context is created * @param pFunction The function to be called at device event occurrences; signature to match: * void(*spinDeviceEventFunction)(const spinDeviceEventData hEventData, const char* pEventName, void* pUserData) * @param pUserData Properties that can be passed into the event function * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinDeviceEventCreate( - @ByPtrPtr spinDeviceEvent phDeviceEvent, + public static native _spinError spinDeviceEventHandlerCreate( + @ByPtrPtr spinDeviceEventHandler phDeviceEventHandler, spinDeviceEventFunction pFunction, Pointer pUserData); /** - * Destroys a device event + * Destroys a device event handler * @see spinError * - * @param hDeviceEvent The device event to destroy + * @param hDeviceEventHandler The device event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinDeviceEventDestroy(spinDeviceEvent hDeviceEvent); + public static native _spinError spinDeviceEventHandlerDestroy(spinDeviceEventHandler hDeviceEventHandler); /** - * Creates an image event + * Creates an image event handler * @see spinError * - * @param phImageEvent The image event handle pointer in which the image event context is created + * @param phImageEventHandler The image event handler pointer in which the image event context is created * @param pFunction The function to be called at image event occurrences; signature to match: * void(*spinImageEventFunction)(const spinImage hImage, void* pUserData) * @param pUserData Properties that can be passed into the event function * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinImageEventCreate( - @ByPtrPtr spinImageEvent phImageEvent, + public static native _spinError spinImageEventHandlerCreate( + @ByPtrPtr spinImageEventHandler phImageEventHandler, spinImageEventFunction pFunction, Pointer pUserData); /** - * Destroys an image event + * Destroys an image event handler * @see spinError * - * @param hImageEvent The image event to destroy + * @param hImageEventHandler The image event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinImageEventDestroy(spinImageEvent hImageEvent); + public static native _spinError spinImageEventHandlerDestroy(spinImageEventHandler hImageEventHandler); /** - * Creates an arrival event + * Creates a device arrival event handler * @see spinError * - * @param phArrivalEvent The arrival event handle pointer in which the arrival event context is created + * @param phDeviceArrivalEventHandler The device arrival event handler pointer in which the device arrival event + * context is created * @param pFunction The function to be called at device event occurrences; signature to match: * void(*spinArrivalEventFunction)(void* pUserData) * @param pUserData Properties that can be passed into the event function * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinArrivalEventCreate( - @ByPtrPtr spinArrivalEvent phArrivalEvent, + public static native _spinError spinDeviceArrivalEventHandlerCreate( + @ByPtrPtr spinDeviceArrivalEventHandler phDeviceArrivalEventHandler, spinArrivalEventFunction pFunction, Pointer pUserData); /** - * Destroys an arrival event + * Destroys a device arrival event handler * @see spinError * - * @param hArrivalEvent The arrival event to destroy + * @param hDeviceArrivalEventHandler The device arrival event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinArrivalEventDestroy(spinArrivalEvent hArrivalEvent); + public static native _spinError spinDeviceArrivalEventHandlerDestroy(spinDeviceArrivalEventHandler hDeviceArrivalEventHandler); /** - * Creates a removal event + * Creates a device removal event handler * @see spinError * - * @param phRemovalEvent The removal event handle pointer in which the removal event context is created + * @param phDeviceRemovalEventHandler The device removal event handler pointer in which the device removal event + context is created * @param pFunction The function to be called at device event occurrences; signature to match: void(*spinRemovalEventFunction)(uint64_t deviceSerialNumber, void* pUserData)

@@ -8927,26 +9082,27 @@ public static native _spinError spinArrivalEventCreate( * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinRemovalEventCreate( - @ByPtrPtr spinRemovalEvent phRemovalEvent, + public static native _spinError spinDeviceRemovalEventHandlerCreate( + @ByPtrPtr spinDeviceRemovalEventHandler phDeviceRemovalEventHandler, spinRemovalEventFunction pFunction, Pointer pUserData); /** - * Destroys a removal event + * Destroys a device removal event handler * @see spinError * - * @param hRemovalEvent The removal event to destroy + * @param hDeviceRemovalEventHandler The device removal event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinRemovalEventDestroy(spinRemovalEvent hRemovalEvent); + public static native _spinError spinDeviceRemovalEventHandlerDestroy(spinDeviceRemovalEventHandler hDeviceRemovalEventHandler); /** - * Creates an interface event (both arrival and removal) + * Creates an interface event handler (both device arrival and device removal) * @see spinError * - * @param phInterfaceEvent The interface event handle pointer in which the interface event context is created + * @param phInterfaceEventHandler The interface event handler pointer in which the interface event context is + * created * @param pArrivalFunction The function to be called at arrival event occurrences; signature to match: * void(*spinArrivalEventFunction)(void* pUserData) * @param hRemovalFunction The function to be called at removal event occurrences; signature to match: @@ -8955,44 +9111,47 @@ public static native _spinError spinRemovalEventCreate( * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceEventCreate( - @ByPtrPtr spinInterfaceEvent phInterfaceEvent, + public static native _spinError spinInterfaceEventHandlerCreate( + @ByPtrPtr spinInterfaceEventHandler phInterfaceEventHandler, spinArrivalEventFunction pArrivalFunction, spinRemovalEventFunction pRemovalFunction, Pointer pUserData); /** - * Destroys an interface event (both arrival and removal) + * Destroys an interface event handler (both device arrival and device removal) * @see spinError * - * @param hInterfaceEvent The interface event to destroy + * @param hInterfaceEventHandler The interface event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinInterfaceEventDestroy(spinInterfaceEvent hInterfaceEvent); + public static native _spinError spinInterfaceEventHandlerDestroy(spinInterfaceEventHandler hInterfaceEventHandler); /** - * Creates a log event + * Creates a log event handler * @see spinError * - * @param phLogEvent The log event handle pointer in which the log event context is created + * @param phLogEventHandler The log event handler pointer in which the log event context is created * @param pFunction The function to be called at device event occurrences; signature to match: * void(*spinLogEventFunction)(const spinLogEventData hEventData, void* pUserData) * @param pUserData Properties that can be passed into the event function * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinLogEventCreate(@ByPtrPtr spinLogEvent phLogEvent, spinLogEventFunction pFunction, Pointer pUserData); + public static native _spinError spinLogEventHandlerCreate( + @ByPtrPtr spinLogEventHandler phLogEventHandler, + spinLogEventFunction pFunction, + Pointer pUserData); /** - * Destroys a log event + * Destroys a log event handler * @see spinError * - * @param hLogEvent The log event to destroy + * @param hLogEventHandler The log event handler to destroy * * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error */ - public static native _spinError spinLogEventDestroy(spinLogEvent hLogEvent); + public static native _spinError spinLogEventHandlerDestroy(spinLogEventHandler hLogEventHandler); /*@}*/ /** @@ -9480,89 +9639,6 @@ public static native _spinError spinDeviceEventGetPayloadData( public static native @Cast("_spinError") int spinDeviceEventGetName(spinDeviceEventData hDeviceEventData, @Cast("char*") ByteBuffer pBuf, @Cast("size_t*") SizeTPointer pBufLen); public static native _spinError spinDeviceEventGetName(spinDeviceEventData hDeviceEventData, @Cast("char*") byte[] pBuf, @Cast("size_t*") SizeTPointer pBufLen); - /*@}*/ - - /** - * \defgroup CAVIRecorder AVIRecorder Access - * - * \brief The functions in this section provide access to AVI recording - * capabilities, which include opening, building, and closing video - * files. - * - * NOTE: This class is deprecated and replaced by SpinVideo. Refer to SpinVideoC.h instead. - */ - /*@{*/ - - /* - * Opens an empty video file to create an uncompressed AVI video - * @see spinError - * - * @param phRecorder The AVI recorder handle pointer in which the AVI recorder is returned - * @param pName The filename to save the video as; do not include the extension - * @param option The video options related to saving as uncompressed AVI; includes frame rate - * - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - - /* - * Opens an empty video file to create an MJPG file - * @see spinError - * - * @param phRecorder The AVI recorder handle pointer in which the AVI recorder is returned - * @param pName The filename to save the video as; do not include the extension - * @param option The video options related to saving as MJPG; includes frame rate and quality - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - - /* - * Opens an empty video file to create an H264 MP4 file - * @see spinError - * - * @param phRecorder The AVI recorder handle pointer in which the AVI recorder is returned - * @param pName The filename to save the video as; do not include the extension - * @param option The video options related to saving as MJPG; includes frame rate, bitrate, height, and width - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - - /* - * Appends an image to the end of an open video file - * @see spinError - * - * @param hRecorder The AVI recorder to append the image to - * @param hImage The image to append - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - - /** - * Set the maximum file size (in megabytes) of a AVI/MP4 file. A new AVI/MP4 file - * is created automatically when file size limit is reached. Setting - * a maximum size of 0 indicates no limit on file size. - * - * @param spinAVIRecorder The AVI recorder to append the image to - * @param size The maximum AVI file size in MB. - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - - /* - * Closes a video file to complete its creation - * @see spinError - * - * @param hRecorder The AVI recorder to close - * - * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error - */ - - /*@}*/ // Chunk data from Image @@ -9620,7 +9696,7 @@ public static native _spinError spinDeviceEventGetPayloadData( // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -9752,7 +9828,7 @@ public static native _spinError spinDeviceEventGetPayloadData( // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -9767,7 +9843,7 @@ public static native _spinError spinDeviceEventGetPayloadData( // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #ifndef FLIR_SPINNAKER_QUICKSPINDEFS_C_H @@ -9784,7 +9860,7 @@ public static native _spinError spinDeviceEventGetPayloadData( // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -9916,7 +9992,7 @@ public static native _spinError quickSpinInitEx( // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -9931,7 +10007,7 @@ public static native _spinError quickSpinInitEx( // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #ifndef FLIR_SPINNAKERC_TRANSPORTLAYERDEFSC_H @@ -9952,29 +10028,19 @@ public static native _spinError quickSpinInitEx( */ public enum _spinTLStreamTypeEnums { - /** Stream Type - Mixed*/ - StreamType_Mixed(0), - /** Stream Type - Custom*/ - StreamType_Custom(1), - /** Stream Type - GEV*/ - StreamType_GEV(2), - /** Stream Type - CL*/ - StreamType_CL(3), - /** Stream Type - IIDC*/ - StreamType_IIDC(4), - /** Stream Type - UVC*/ - StreamType_UVC(5), - /** Stream Type - CXP*/ - StreamType_CXP(6), - /** Stream Type - CLHS*/ - StreamType_CLHS(7), - /** Stream Type - U3V*/ - StreamType_U3V(8), - /** Stream Type - ETHERNET*/ - StreamType_ETHERNET(9), - /** Stream Type - PCI*/ - StreamType_PCI(10), - NUMSTREAMTYPE(11); + /** GigE Vision*/ + StreamType_GigEVision(0), + /** Camera Link*/ + StreamType_CameraLink(1), + /** Camera Link High Speed*/ + StreamType_CameraLinkHS(2), + /** CoaXPress*/ + StreamType_CoaXPress(3), + /** USB3 Vision*/ + StreamType_USB3Vision(4), + /** Custom transport layer*/ + StreamType_Custom(5), + NUMSTREAMTYPE(6); public final int value; private _spinTLStreamTypeEnums(int v) { this.value = v; } @@ -9983,24 +10049,10 @@ public enum _spinTLStreamTypeEnums { @Override public String toString() { return intern().name(); } } -public enum _spinTLStreamDefaultBufferCountModeEnums { - /** DEPRECATED. The number of buffers used for the stream are set by the user.*/ - StreamDefaultBufferCountMode_Manual(0), - /** DEPRECATED. The number of buffers used for the stream is automatically calculated.*/ - StreamDefaultBufferCountMode_Auto(1), - NUMSTREAMDEFAULTBUFFERCOUNTMODE(2); - - public final int value; - private _spinTLStreamDefaultBufferCountModeEnums(int v) { this.value = v; } - private _spinTLStreamDefaultBufferCountModeEnums(_spinTLStreamDefaultBufferCountModeEnums e) { this.value = e.value; } - public _spinTLStreamDefaultBufferCountModeEnums intern() { for (_spinTLStreamDefaultBufferCountModeEnums e : values()) if (e.value == value) return e; return this; } - @Override public String toString() { return intern().name(); } -} - public enum _spinTLStreamBufferCountModeEnums { /** The number of buffers used for the stream are set by the user.*/ StreamBufferCountMode_Manual(0), - /** The number of buffers used for the stream is automatically calculated based on the device frame rate.*/ + /** DEPRECATED. The number of buffers used for the stream is automatically calculated based on the device frame rate.*/ StreamBufferCountMode_Auto(1), NUMSTREAMBUFFERCOUNTMODE(2); @@ -10016,13 +10068,11 @@ public enum _spinTLStreamBufferHandlingModeEnums { StreamBufferHandlingMode_OldestFirst(0), /** The application always gets the buffer from the head of the output buffer queue (thus, the oldest available one). If the output buffer queue is empty, the application waits for a newly acquired buffer until the timeout expires. If a new buffer arrives it will overwrite the existing buffer from the head of the queue (behaves like a circular buffer).*/ StreamBufferHandlingMode_OldestFirstOverwrite(1), - /** The application always gets the buffer from the tail of the output buffer queue (thus, the newest available one). If the output buffer queue is empty, the application waits for a newly acquired buffer until the timeout expires.*/ - StreamBufferHandlingMode_NewestFirst(2), - /** DEPRECATED. This is replaced by NewestOnly.*/ - StreamBufferHandlingMode_NewestFirstOverwrite(3), /** The application always gets the latest completed buffer (the newest one). If the Output Buffer Queue is empty, the application waits for a newly acquired buffer until the timeout expires. This buffer handling mode is typically used in a live display GUI where it is important that there is no lag between camera and display.*/ - StreamBufferHandlingMode_NewestOnly(4), - NUMSTREAMBUFFERHANDLINGMODE(5); + StreamBufferHandlingMode_NewestOnly(2), + /** The application always gets the buffer from the tail of the output buffer queue (thus, the newest available one). If the output buffer queue is empty, the application waits for a newly acquired buffer until the timeout expires.*/ + StreamBufferHandlingMode_NewestFirst(3), + NUMSTREAMBUFFERHANDLINGMODE(4); public final int value; private _spinTLStreamBufferHandlingModeEnums(int v) { this.value = v; } @@ -10032,29 +10082,19 @@ public enum _spinTLStreamBufferHandlingModeEnums { } public enum _spinTLDeviceTypeEnums { - /** TL - Mixed*/ - DeviceType_Mixed(0), - /** TL - Custom*/ - DeviceType_Custom(1), - /** TL - GEV*/ - DeviceType_GEV(2), - /** TL - CL*/ - DeviceType_CL(3), - /** TL - IIDC*/ - DeviceType_IIDC(4), - /** TL - UVC*/ - DeviceType_UVC(5), - /** TL - CXP*/ - DeviceType_CXP(6), - /** TL - CLHS*/ - DeviceType_CLHS(7), - /** TL - U3V*/ - DeviceType_U3V(8), - /** TL - ETHERNET*/ - DeviceType_ETHERNET(9), - /** TL - PCI*/ - DeviceType_PCI(10), - NUMDEVICETYPE(11); + /** GigE Vision*/ + DeviceType_GigEVision(0), + /** Camera Link*/ + DeviceType_CameraLink(1), + /** Camera Link High Speed*/ + DeviceType_CameraLinkHS(2), + /** CoaXPress*/ + DeviceType_CoaXPress(3), + /** USB3 Vision*/ + DeviceType_USB3Vision(4), + /** Custom transport layer*/ + DeviceType_Custom(5), + NUMDEVICETYPE(6); public final int value; private _spinTLDeviceTypeEnums(int v) { this.value = v; } @@ -10165,6 +10205,28 @@ public enum _spinTLDeviceCurrentSpeedEnums { @Override public String toString() { return intern().name(); } } +public enum _spinTLInterfaceTypeEnums { + /** GigE Vision*/ + InterfaceType_GigEVision(0), + /** Camera Link*/ + InterfaceType_CameraLink(1), + /** Camera Link High Speed*/ + InterfaceType_CameraLinkHS(2), + /** CoaXPress*/ + InterfaceType_CoaXPress(3), + /** USB3 Vision*/ + InterfaceType_USB3Vision(4), + /** Custom transport layer*/ + InterfaceType_Custom(5), + NUMINTERFACETYPE(6); + + public final int value; + private _spinTLInterfaceTypeEnums(int v) { this.value = v; } + private _spinTLInterfaceTypeEnums(_spinTLInterfaceTypeEnums e) { this.value = e.value; } + public _spinTLInterfaceTypeEnums intern() { for (_spinTLInterfaceTypeEnums e : values()) if (e.value == value) return e; return this; } + @Override public String toString() { return intern().name(); } +} + public enum _spinTLPOEStatusEnums { /** Not Supported*/ POEStatus_NotSupported(0), @@ -10197,6 +10259,30 @@ public enum _spinTLFilterDriverStatusEnums { @Override public String toString() { return intern().name(); } } +public enum _spinTLTLTypeEnums { + /** GigE Vision*/ + TLType_GigEVision(0), + /** Camera Link*/ + TLType_CameraLink(1), + /** Camera Link High Speed*/ + TLType_CameraLinkHS(2), + /** CoaXPress*/ + TLType_CoaXPress(3), + /** USB3 Vision*/ + TLType_USB3Vision(4), + /** Different Interface modules of the GenTL Producer are of different types*/ + TLType_Mixed(5), + /** Custom transport layer*/ + TLType_Custom(6), + NUMTLTYPE(7); + + public final int value; + private _spinTLTLTypeEnums(int v) { this.value = v; } + private _spinTLTLTypeEnums(_spinTLTLTypeEnums e) { this.value = e.value; } + public _spinTLTLTypeEnums intern() { for (_spinTLTLTypeEnums e : values()) if (e.value == value) return e; return this; } + @Override public String toString() { return intern().name(); } +} + /*@}*/ /*@}*/ @@ -10206,7 +10292,7 @@ public enum _spinTLFilterDriverStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10221,7 +10307,7 @@ public enum _spinTLFilterDriverStatusEnums { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #include "QuickSpinC.h" @@ -10239,7 +10325,7 @@ public enum _spinTLFilterDriverStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10254,7 +10340,7 @@ public enum _spinTLFilterDriverStatusEnums { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #include "QuickSpinC.h" @@ -10272,7 +10358,7 @@ public enum _spinTLFilterDriverStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10287,7 +10373,7 @@ public enum _spinTLFilterDriverStatusEnums { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #include "QuickSpinC.h" @@ -10305,7 +10391,7 @@ public enum _spinTLFilterDriverStatusEnums { // Parsed from //============================================================================= -// Copyright (c) 2001-2019 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10320,7 +10406,7 @@ public enum _spinTLFilterDriverStatusEnums { // SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING // THIS SOFTWARE OR ITS DERIVATIVES. //============================================================================= - + /* Auto-generated file. Do not modify. */ // #include "QuickSpinC.h" diff --git a/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java b/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java index 817eab71c0a..a9113d41630 100644 --- a/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java +++ b/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java @@ -32,7 +32,7 @@ import org.bytedeco.javacpp.tools.InfoMapper; /** - * Wrapper for Point Grey Spinnaker_C library (the C API v.1). + * Wrapper for Point Grey Spinnaker_C library (the C API v.2). * * @author Jarek Sacha */ @@ -41,35 +41,50 @@ global = "org.bytedeco.spinnaker.global.Spinnaker_C", value = { @Platform(value = {"linux-x86_64", "linux-arm64", "windows"}, include = {"", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", }, - link = {"SpinVideo_C@.1", "Spinnaker_C@.1"}, - linkpath = "/usr/lib/", - includepath = "/usr/include/spinnaker/spinc/"), + link = {"SpinVideo_C@.2", "Spinnaker_C@.2"}, + linkpath = {"/opt/spinnaker/lib/", + "/usr/lib/"}, + includepath = {"/opt/spinnaker/include/spinc/", + "/usr/include/spinnaker/spinc/"}), @Platform(value = "windows", link = {"SpinnakerC_v140", "Spinnaker_v140", "SpinVideoC_v140", "SpinVideo_v140"}, - includepath = {"C:/Program Files/Spinnaker/include/spinc/", "C:/Program Files/Point Grey Research/Spinnaker/include/spinc/", - "C:/Program Files (x86)/Spinnaker/include/spinc/", "C:/Program Files (x86)/Point Grey Research/Spinnaker/include/spinc/"}), + includepath = {"C:/Program Files/FLIR Systems/Spinnaker/include/spinc/", + "C:/Program Files (x86)/FLIR Systems/Spinnaker/include/spinc/", + // CI installation skips "FLIR Systems" dir + "C:/Program Files/Spinnaker/include/spinc/", + "C:/Program Files (x86)/Spinnaker/include/spinc"}), @Platform(value = "windows-x86", - linkpath = {"C:/Program Files/Spinnaker/lib/vs2015/", "C:/Program Files/Point Grey Research/Spinnaker/lib/vs2015/", - "C:/Program Files (x86)/Spinnaker/lib/vs2015/", "C:/Program Files (x86)/Point Grey Research/Spinnaker/lib/vs2015/"}, - preloadpath = {"C:/Program Files/Spinnaker/bin/vs2015/", "C:/Program Files/Point Grey Research/Spinnaker/bin/vs2015/", - "C:/Program Files (x86)/Spinnaker/bin/vs2015/", "C:/Program Files (x86)/Point Grey Research/Spinnaker/bin/vs2015/"}), + linkpath = {"C:/Program Files/FLIR Systems/Spinnaker/lib/vs2015/", + "C:/Program Files (x86)/FLIR Systems/Spinnaker/lib/vs2015/", + // CI installation skips "FLIR Systems" dir + "C:/Program Files/Spinnaker/lib/vs2015", + "C:/Program Files (x86)/Spinnaker/lib/vs2015"}, + preloadpath = {"C:/Program Files/FLIR Systems/Spinnaker/bin/vs2015/", + "C:/Program Files (x86)/FLIR Systems/Spinnaker/bin/vs2015/", + // CI installation skips "FLIR Systems" dir + "C:/Program Files/Spinnaker/bin/vs2015/", + "C:/Program Files (x86)/Spinnaker/bin/vs2015/",}), @Platform(value = "windows-x86_64", - linkpath = {"C:/Program Files/Spinnaker/lib64/vs2015/", "C:/Program Files/Point Grey Research/Spinnaker/lib64/vs2015/"}, - preloadpath = {"C:/Program Files/Spinnaker/bin64/vs2015/", "C:/Program Files/Point Grey Research/Spinnaker/bin64/vs2015/"})}) + linkpath = {"C:/Program Files/FLIR Systems/Spinnaker/lib64/vs2015/", + // CI automatic installation skips "LIR Systems" dir? + "C:/Program Files/Spinnaker/lib64/vs2015/"}, + preloadpath = {"C:/Program Files/FLIR Systems/Spinnaker/bin64/vs2015/", + // CI automatic installation skips "LIR Systems" dir? + "C:/Program Files/Spinnaker/bin64/vs2015/"})}) public class Spinnaker_C implements InfoMapper { static { Loader.checkVersion("org.bytedeco", "spinnaker"); } @@ -78,13 +93,14 @@ public void map(InfoMap infoMap) { .put(new Info("SPINC_CALLTYPE").cppTypes().annotations().cppText("")) .put(new Info("SPINC_NO_DECLSPEC_STATEMENTS", "EXTERN_C").define()) .put(new Info("SPINNAKERC_API").cppTypes("_spinError").cppText("enum _spinError").define()) - // Skip to avoid linker errors, - // somehow JavaCPP did not generate wrapper for 'SPINNAKERC_API spinRegisterSetEx(...)' - .put(new Info("spinRegisterSetEx").skip()) - // Skip deprecation macro, as it is causing parsing error in javacpp - .put(new Info("SPINNAKERC_API_DEPRECATED").skip()) - // Avoid: jniSpinnaker_C.obj : error LNK2001: unresolved external symbol __imp_spinCameraForceIP +// // Skip deprecation macro, as it is causing parsing error in javacpp +// .put(new Info("SPINNAKERC_API_DEPRECATED").skip()) + // Skip to avoid linker errors, somehow JavaCPP did not generate wrappers for those functions, + // To avoid errors like: jniSpinnaker_C.obj : error LNK2001: unresolved external symbol spinCameraForceIP .put(new Info("spinCameraForceIP").skip()) + .put(new Info("spinRegisterSetEx").skip()) + .put(new Info("spinSystemSendActionCommand").skip()) + .put(new Info("spinInterfaceSendActionCommand").skip()) ; } }