diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
index 49e1428d78c..e1927e9cd04 100644
--- a/.github/actions/deploy-centos/action.yml
+++ b/.github/actions/deploy-centos/action.yml
@@ -145,8 +145,8 @@ 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=1zr9k4x-NI3OkVMLCccSBY4VtR-16iAQG
- tar -xzvf spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz
+ python3 -m gdown.cli https://drive.google.com/uc?id=1B91OxuFgT-T29fNlBc2gsgr-K2l2LNtw
+ tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz
find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done;
fi
diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
index 52fc8b957cd..cdb937452ff 100644
--- a/.github/actions/deploy-windows/action.yml
+++ b/.github/actions/deploy-windows/action.yml
@@ -148,20 +148,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=15i6tV-vahgm_uNWT96c_KX7tFdZxmev-
- python -m gdown.cli https://drive.google.com/uc?id=1ikOyG-gVettvjoJGQWkHxOcBWuTrGyfz
+ python -m gdown.cli https://drive.google.com/uc?id=17GagcVjj2Gv6WswJR86_DKw9jLEfHHdo
+ python -m gdown.cli https://drive.google.com/uc?id=1i93o2rFPtRKrCGBH2bUL5FQZchrDzrDe
rem We can get these msi files by starting the installation from the exe file
- 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"
+ cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_Binaries_v140_x86.msi ADDLOCAL=ALL"
+ cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_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=1NiMxxDflip1F5rJuf73xhfoI9vWUeUkQ
- python -m gdown.cli https://drive.google.com/uc?id=1FKatuVsLIQLbDb9R9W2ax_tav8_7--HI
+ python -m gdown.cli https://drive.google.com/uc?id=12AkFMckbDqxFudYGWwaSLT7omOTtuRJt
+ python -m gdown.cli https://drive.google.com/uc?id=1_SUnBQnv4czISJWVFnbxxWRZM6d2yzZK
rem We can get these msi files by starting the installation from the exe file
- 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"
+ cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_Binaries_v140_x64.msi ADDLOCAL=ALL"
+ cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_SourceCode_v140_x64.msi ADDLOCAL=ALL"
)
set GRADLE_TASK=publishToMavenLocal
diff --git a/README.md b/README.md
index e7d44db1a90..3cd3992a64f 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* OpenCV 4.7.x https://opencv.org/releases/
* FFmpeg 5.1.x http://ffmpeg.org/download.html
* FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk
- * Spinnaker 2.4.x https://www.flir.com/products/spinnaker-sdk
+ * Spinnaker 3.0.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 5a3cec0ada7..2c7ab157694 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-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+ if [[ $(find $HOME/downloads/spinnaker-3.0.0.118-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 1zr9k4x-NI3OkVMLCccSBY4VtR-16iAQG $HOME/downloads/spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz
+ python $TRAVIS_BUILD_DIR/ci/gDownload.py 1ILDEZk0SuOoh4_cJExpZJCPXCqfxUkAi $HOME/downloads/spinnaker-3.0.0.118-amd64-pkg.tar.gz
fi
- 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
+ tar xzvf $HOME/downloads/spinnaker-spinnaker-3.0.0.118-amd64-pkg.tar.gz -C $TRAVIS_BUILD_DIR/../
+ ls $TRAVIS_BUILD_DIR/../spinnaker-3.0.0.118-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done;
+ ln -s libSpinnaker_C.so.3.0.0.118 usr/lib/libSpinnaker_C.so.1
+ ln -s libSpinnaker.so.3.0.0.118 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 60d6405115e..f735872a493 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_2.4.0.143_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then
+ if [[ $(find /c/Downloads/Spinnaker_3.0.0.118_*_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 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
+ /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 12AkFMckbDqxFudYGWwaSLT7omOTtuRJt /c/Downloads/Spinnaker_3.0.0.118_Binaries_v140_x64.msi
+ /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1_SUnBQnv4czISJWVFnbxxWRZM6d2yzZK /c/Downloads/Spinnaker_3.0.0.118_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_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'
+ cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_Binaries_v140_x64.msi ADDLOCAL=ALL'
+ cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_SourceCode_v140_x64.msi ADDLOCAL=ALL'
elif [ "$OS" == "windows-x86" ]; then
- if [[ $(find /c/Downloads/Spinnaker_2.4.0.143_*_v140_x86.msi -type f -size +1000000c 2>/dev/null) ]]; then
+ if [[ $(find /c/Downloads/Spinnaker_3.0.0.118_*_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 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
+ /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 17GagcVjj2Gv6WswJR86_DKw9jLEfHHdo /c/Downloads/Spinnaker_3.0.0.118_Binaries_v140_x86.msi
+ /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1i93o2rFPtRKrCGBH2bUL5FQZchrDzrDe /c/Downloads/Spinnaker_3.0.0.118_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_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'
+ cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_Binaries_v140_x86.msi ADDLOCAL=ALL'
+ cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_SourceCode_v140_x86.msi ADDLOCAL=ALL'
fi
echo "Finished spinnaker install"
fi
diff --git a/platform/pom.xml b/platform/pom.xml
index 4ae7f5b3d12..ea2a4ff16db 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -101,7 +101,7 @@
org.bytedeco
spinnaker-platform
- 2.4.0.143-${project.version}
+ 3.0.0.118-${project.version}
org.bytedeco
diff --git a/spinnaker/README.md b/spinnaker/README.md
index fd22f6c0f50..aed1e14ec5a 100644
--- a/spinnaker/README.md
+++ b/spinnaker/README.md
@@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:
- * Spinnaker 2.4.0.143 https://www.flir.com/products/spinnaker-sdk
+ * Spinnaker 3.0.0.118 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.8
+ 1.5.9-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
- 2.4.0.143-1.5.8
+ 3.0.0.118-1.5.9-SNAPSHOT
@@ -473,7 +473,14 @@ public class Acquisition_C {
if (printOnError(err, "Unable to create image. Non-fatal error.")) {
hasFailed = true;
}
- err = spinImageConvert(hResultImage, spinPixelFormatEnums.PixelFormat_Mono8, hConvertedImage);
+
+ spinImageProcessor hImageProcessor = new spinImageProcessor(); // NULL;
+ err = spinImageProcessorCreate(hImageProcessor);
+ if (printOnError(err, "Unable to create image processor. Non-fatal error.")) {
+ hasFailed = true;
+ }
+
+ err = spinImageProcessorConvert(hImageProcessor, hResultImage, hConvertedImage, spinPixelFormatEnums.PixelFormat_Mono8);
if (printOnError(err, "\"Unable to convert image. Non-fatal error.")) {
hasFailed = true;
}
@@ -492,7 +499,7 @@ public class Acquisition_C {
// numbers to keep images of one device from overwriting those of
// another.
//
- err = spinImageSave(hConvertedImage, new BytePointer(filename), spinImageFileFormat.JPEG);
+ err = spinImageSave(hConvertedImage, new BytePointer(filename), spinImageFileFormat.SPINNAKER_IMAGE_FILE_FORMAT_JPEG);
if (!printOnError(err, "Unable to save image. Non-fatal error.")) {
System.out.println("Image saved at " + filename + "\n");
}
diff --git a/spinnaker/cppbuild.sh b/spinnaker/cppbuild.sh
index b98648fa43c..bc85c25571e 100755
--- a/spinnaker/cppbuild.sh
+++ b/spinnaker/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi
-SPINNAKER_VERSION=2.4.0.143
+SPINNAKER_VERSION=3.0.0.118
case $PLATFORM in
linux-arm*)
diff --git a/spinnaker/platform/pom.xml b/spinnaker/platform/pom.xml
index 8d353d8a2fb..16b2ad56eeb 100644
--- a/spinnaker/platform/pom.xml
+++ b/spinnaker/platform/pom.xml
@@ -12,7 +12,7 @@
org.bytedeco
spinnaker-platform
- 2.4.0.143-${project.parent.version}
+ 3.0.0.118-${project.parent.version}
JavaCPP Presets Platform for Spinnaker
diff --git a/spinnaker/pom.xml b/spinnaker/pom.xml
index 94b034fe05e..68bd81e882f 100644
--- a/spinnaker/pom.xml
+++ b/spinnaker/pom.xml
@@ -11,7 +11,7 @@
org.bytedeco
spinnaker
- 2.4.0.143-${project.parent.version}
+ 3.0.0.118-${project.parent.version}
JavaCPP Presets for Spinnaker
diff --git a/spinnaker/samples/Acquisition_C.java b/spinnaker/samples/Acquisition_C.java
index 81ee062edcb..cea4ce99705 100644
--- a/spinnaker/samples/Acquisition_C.java
+++ b/spinnaker/samples/Acquisition_C.java
@@ -414,7 +414,14 @@ private static spinError acquireImages(spinCamera hCam, spinNodeMapHandle hNodeM
if (printOnError(err, "Unable to create image. Non-fatal error.")) {
hasFailed = true;
}
- err = spinImageConvert(hResultImage, spinPixelFormatEnums.PixelFormat_Mono8, hConvertedImage);
+
+ spinImageProcessor hImageProcessor = new spinImageProcessor(); // NULL;
+ err = spinImageProcessorCreate(hImageProcessor);
+ if (printOnError(err, "Unable to create image processor. Non-fatal error.")) {
+ hasFailed = true;
+ }
+
+ err = spinImageProcessorConvert(hImageProcessor, hResultImage, hConvertedImage, spinPixelFormatEnums.PixelFormat_Mono8);
if (printOnError(err, "\"Unable to convert image. Non-fatal error.")) {
hasFailed = true;
}
@@ -433,7 +440,7 @@ private static spinError acquireImages(spinCamera hCam, spinNodeMapHandle hNodeM
// numbers to keep images of one device from overwriting those of
// another.
//
- err = spinImageSave(hConvertedImage, new BytePointer(filename), spinImageFileFormat.JPEG);
+ err = spinImageSave(hConvertedImage, new BytePointer(filename), spinImageFileFormat.SPINNAKER_IMAGE_FILE_FORMAT_JPEG);
if (!printOnError(err, "Unable to save image. Non-fatal error.")) {
System.out.println("Image saved at " + filename + "\n");
}
diff --git a/spinnaker/samples/pom.xml b/spinnaker/samples/pom.xml
index 5a8ecb68553..8bd87f09197 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.8
+ 1.5.9-SNAPSHOT
Acquisition_C
1.7
@@ -12,7 +12,7 @@
org.bytedeco
spinnaker-platform
- 2.4.0.143-1.5.8
+ 3.0.0.118-1.5.9-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 7ff35cfebe2..71341b82ed8 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -36,5 +36,5 @@ public class actionCommandResult extends Pointer {
public native @Cast("unsigned int") int DeviceAddress(); public native actionCommandResult DeviceAddress(int setter);
/* Action Command status return from device */
- public native actionCommandStatus Status(); public native actionCommandResult Status(actionCommandStatus setter);
+ public native spinActionCommandStatus Status(); public native actionCommandResult Status(spinActionCommandStatus setter);
}
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 2faca0d9597..745ba28320d 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 05f65c671a2..4568dedd0c8 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -37,25 +37,26 @@ public class quickSpinTLDevice extends Pointer {
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceID(); public native quickSpinTLDevice DeviceID(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceSerialNumber(); public native quickSpinTLDevice DeviceSerialNumber(spinNodeHandle setter);
+ public native @Cast("quickSpinStringNode") spinNodeHandle DeviceUserID(); public native quickSpinTLDevice DeviceUserID(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceVendorName(); public native quickSpinTLDevice DeviceVendorName(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceModelName(); public native quickSpinTLDevice DeviceModelName(spinNodeHandle setter);
+ public native @Cast("quickSpinStringNode") spinNodeHandle DeviceVersion(); public native quickSpinTLDevice DeviceVersion(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle DeviceBootloaderVersion(); public native quickSpinTLDevice DeviceBootloaderVersion(spinNodeHandle setter);
public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceType(); public native quickSpinTLDevice DeviceType(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceDisplayName(); public native quickSpinTLDevice DeviceDisplayName(spinNodeHandle setter);
public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceAccessStatus(); public native quickSpinTLDevice DeviceAccessStatus(spinNodeHandle setter);
- public native @Cast("quickSpinStringNode") spinNodeHandle DeviceVersion(); public native quickSpinTLDevice DeviceVersion(spinNodeHandle setter);
- public native @Cast("quickSpinStringNode") spinNodeHandle DeviceUserID(); public native quickSpinTLDevice DeviceUserID(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle DeviceLinkSpeed(); public native quickSpinTLDevice DeviceLinkSpeed(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceDriverVersion(); public native quickSpinTLDevice DeviceDriverVersion(spinNodeHandle setter);
public native @Cast("quickSpinBooleanNode") spinNodeHandle DeviceIsUpdater(); public native quickSpinTLDevice DeviceIsUpdater(spinNodeHandle setter);
- public native @Cast("quickSpinEnumerationNode") spinNodeHandle GevCCP(); public native quickSpinTLDevice GevCCP(spinNodeHandle setter);
- public native @Cast("quickSpinEnumerationNode") spinNodeHandle GUIXMLLocation(); public native quickSpinTLDevice GUIXMLLocation(spinNodeHandle setter);
- public native @Cast("quickSpinStringNode") spinNodeHandle GUIXMLPath(); public native quickSpinTLDevice GUIXMLPath(spinNodeHandle setter);
public native @Cast("quickSpinEnumerationNode") spinNodeHandle GenICamXMLLocation(); public native quickSpinTLDevice GenICamXMLLocation(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle GenICamXMLPath(); public native quickSpinTLDevice GenICamXMLPath(spinNodeHandle setter);
+ public native @Cast("quickSpinEnumerationNode") spinNodeHandle GUIXMLLocation(); public native quickSpinTLDevice GUIXMLLocation(spinNodeHandle setter);
+ public native @Cast("quickSpinStringNode") spinNodeHandle GUIXMLPath(); public native quickSpinTLDevice GUIXMLPath(spinNodeHandle setter);
+ public native @Cast("quickSpinEnumerationNode") spinNodeHandle GevCCP(); public native quickSpinTLDevice GevCCP(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceMACAddress(); public native quickSpinTLDevice GevDeviceMACAddress(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceIPAddress(); public native quickSpinTLDevice GevDeviceIPAddress(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceSubnetMask(); public native quickSpinTLDevice GevDeviceSubnetMask(spinNodeHandle setter);
- public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceMACAddress(); public native quickSpinTLDevice GevDeviceMACAddress(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceGateway(); public native quickSpinTLDevice GevDeviceGateway(spinNodeHandle setter);
- public native @Cast("quickSpinIntegerNode") spinNodeHandle DeviceLinkSpeed(); public native quickSpinTLDevice DeviceLinkSpeed(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevVersionMajor(); public native quickSpinTLDevice GevVersionMajor(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevVersionMinor(); public native quickSpinTLDevice GevVersionMinor(spinNodeHandle setter);
public native @Cast("quickSpinBooleanNode") spinNodeHandle GevDeviceModeIsBigEndian(); public native quickSpinTLDevice GevDeviceModeIsBigEndian(spinNodeHandle setter);
@@ -72,6 +73,7 @@ public class quickSpinTLDevice extends Pointer {
public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceGateway(); public native quickSpinTLDevice GevDeviceForceGateway(spinNodeHandle setter);
public native @Cast("quickSpinBooleanNode") spinNodeHandle DeviceMulticastMonitorMode(); public native quickSpinTLDevice DeviceMulticastMonitorMode(spinNodeHandle setter);
public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceEndianessMechanism(); public native quickSpinTLDevice DeviceEndianessMechanism(spinNodeHandle setter);
+ public native @Cast("quickSpinCommandNode") spinNodeHandle DeviceReset(); public native quickSpinTLDevice DeviceReset(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceInstanceId(); public native quickSpinTLDevice DeviceInstanceId(spinNodeHandle setter);
public native @Cast("quickSpinStringNode") spinNodeHandle DeviceLocation(); public native quickSpinTLDevice DeviceLocation(spinNodeHandle setter);
public native @Cast("quickSpinEnumerationNode") spinNodeHandle DeviceCurrentSpeed(); public native quickSpinTLDevice DeviceCurrentSpeed(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 197beeefc99..ac5cf193559 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 105b3a0baba..0854826445e 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -37,6 +37,7 @@ public class quickSpinTLStream extends Pointer {
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("quickSpinEnumerationNode") spinNodeHandle StreamMode(); public native quickSpinTLStream StreamMode(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);
@@ -46,21 +47,24 @@ public class quickSpinTLStream extends Pointer {
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 StreamReceivedFrameCount(); public native quickSpinTLStream StreamReceivedFrameCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamIncompleteFrameCount(); public native quickSpinTLStream StreamIncompleteFrameCount(spinNodeHandle setter);
public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamLostFrameCount(); public native quickSpinTLStream StreamLostFrameCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamDroppedFrameCount(); public native quickSpinTLStream StreamDroppedFrameCount(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("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 GevResendRequestCount(); public native quickSpinTLStream GevResendRequestCount(spinNodeHandle setter);
+ public native @Cast("quickSpinBooleanNode") spinNodeHandle StreamCRCCheckEnable(); public native quickSpinTLStream StreamCRCCheckEnable(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamReceivedPacketCount(); public native quickSpinTLStream StreamReceivedPacketCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamMissedPacketCount(); public native quickSpinTLStream StreamMissedPacketCount(spinNodeHandle setter);
+ public native @Cast("quickSpinBooleanNode") spinNodeHandle StreamPacketResendEnable(); public native quickSpinTLStream StreamPacketResendEnable(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendTimeout(); public native quickSpinTLStream StreamPacketResendTimeout(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendMaxRequests(); public native quickSpinTLStream StreamPacketResendMaxRequests(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendRequestCount(); public native quickSpinTLStream StreamPacketResendRequestCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendRequestSuccessCount(); public native quickSpinTLStream StreamPacketResendRequestSuccessCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendRequestedPacketCount(); public native quickSpinTLStream StreamPacketResendRequestedPacketCount(spinNodeHandle setter);
+ public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketResendReceivedPacketCount(); public native quickSpinTLStream StreamPacketResendReceivedPacketCount(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 19021dbe5ad..c11e1018760 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -60,4 +60,5 @@ public class quickSpinTLSystem extends Pointer {
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("quickSpinBooleanNode") spinNodeHandle EnumerateUSBInterfaces(); public native quickSpinTLSystem EnumerateUSBInterfaces(spinNodeHandle setter);
+ public native @Cast("quickSpinBooleanNode") spinNodeHandle EnumerateGen2Cameras(); public native quickSpinTLSystem EnumerateGen2Cameras(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 7f1bc07cbfa..2ee42f74a2f 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -36,13 +36,12 @@ public class spinAVIOption extends Pointer {
/** Frame rate of the stream */
public native float frameRate(); public native spinAVIOption frameRate(float setter);
- /** Reserved for future use */
+ /** Width of source image */
+ public native @Cast("unsigned int") int width(); public native spinAVIOption width(int setter);
+
+ /** Height of source image */
+ public native @Cast("unsigned int") int height(); public native spinAVIOption height(int setter);
+
public native @Cast("unsigned int") int reserved(int i); public native spinAVIOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinAVIOption()
- {
- frameRate = 15.0;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 c2ca4c82845..a2acfcdae62 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -18,5 +18,5 @@ public class spinArrivalEventFunction extends FunctionPointer {
public spinArrivalEventFunction(Pointer p) { super(p); }
protected spinArrivalEventFunction() { allocate(); }
private native void allocate();
- public native void call(@Cast("uint64_t") int deviceSerialNumber, Pointer pUserData);
+ public native void call(spinCamera hCamera, Pointer pUserData);
}
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 f0940b52ecf..163e5da3745 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -37,10 +37,4 @@ public class spinBMPOption extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinBMPOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinBMPOption()
- {
- indexedColor_8bit = false;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 2dc82d9f06b..9267dc9b3e3 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 5bc46b0dd44..6f525d48c04 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 ef248e11f66..ee2e6e0cb85 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java
index c339929638f..6a667fccbe9 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceArrivalEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 d6a34a1d353..c6edfdf9c8a 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 696e9d5c2f4..41a5390074d 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java
index 2ccace7e84c..c8fd4a54434 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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
index 8f9609fc700..9449f5e0552 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceRemovalEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinDeviceRemovalEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 f5372289473..d7a80ef9c6e 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -48,13 +48,4 @@ public class spinH264Option extends Pointer {
/** Reserved for future use */
public native @Cast("unsigned int") int reserved(int i); public native spinH264Option reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinH264Option()
- {
- frameRate = 15.0;
- width = 0;
- height = 0;
- bitrate = 1000000;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 307d2ab3a1f..a4ca2c6d581 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 31f5e2e463d..a88bbfbb55d 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java
index 11de091b290..35b626c2c02 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageList.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageList.java
new file mode 100644
index 00000000000..2d2baffe02a
--- /dev/null
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageList.java
@@ -0,0 +1,27 @@
+// Targeted by JavaCPP version 1.5.9-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 image list functionality. Created by calling
+ * spinCameraGetNextImageSync(), which require a call to
+ * spinImageRelease() to remove from buffer, or
+ * spinImageCreateEmpty(), spinImageCreateEx(), or spinImageCreate(),
+ * which require a call to spinImageDestroy() to destroy.
+ */
+@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
+public class spinImageList extends Pointer {
+ /** Empty constructor. Calls {@code super((Pointer)null)}. */
+ public spinImageList() { super((Pointer)null); }
+ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+ public spinImageList(Pointer p) { super(p); }
+}
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventFunction.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventFunction.java
new file mode 100644
index 00000000000..c094bf45bb9
--- /dev/null
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventFunction.java
@@ -0,0 +1,22 @@
+// Targeted by JavaCPP version 1.5.9-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.*;
+
+
+@Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
+public class spinImageListEventFunction extends FunctionPointer {
+ static { Loader.load(); }
+ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+ public spinImageListEventFunction(Pointer p) { super(p); }
+ protected spinImageListEventFunction() { allocate(); }
+ private native void allocate();
+ public native void call(spinImageList hImage, Pointer pUserData);
+}
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventHandler.java
new file mode 100644
index 00000000000..956efcb1050
--- /dev/null
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventHandler.java
@@ -0,0 +1,25 @@
+// Targeted by JavaCPP version 1.5.9-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 image list event handler functionality. Created by calling
+ * spinImageListEventHandlerCreate(), which requires a call to spinImageListEventHandlerDestroy()
+ * to destroy.
+ */
+@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
+public class spinImageListEventHandler extends Pointer {
+ /** Empty constructor. Calls {@code super((Pointer)null)}. */
+ public spinImageListEventHandler() { super((Pointer)null); }
+ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+ public spinImageListEventHandler(Pointer p) { super(p); }
+}
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageProcessor.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageProcessor.java
new file mode 100644
index 00000000000..a7fce41be40
--- /dev/null
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageProcessor.java
@@ -0,0 +1,25 @@
+// Targeted by JavaCPP version 1.5.9-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 image processor functionality. Created by calling
+ * spinImageProcessorCreate(), which requires a call to
+ * spinImageProcessorDestroy() to destroy.
+ */
+@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
+public class spinImageProcessor extends Pointer {
+ /** Empty constructor. Calls {@code super((Pointer)null)}. */
+ public spinImageProcessor() { super((Pointer)null); }
+ /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+ public spinImageProcessor(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 13018a43cba..0fbb5f99116 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 d87c3f2ceb1..1a2911353f7 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java
index 3d268fe408e..3ba95dd4d38 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinInterfaceEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 5f150ae392b..fb84da968e1 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 c440eb3a1ec..5458ab5ab3c 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -46,11 +46,4 @@ public class spinJPEGOption extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinJPEGOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinJPEGOption()
- {
- progressive = false;
- quality = 75;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 53e06194ae3..f7aa3e498d7 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -38,10 +38,4 @@ public class spinJPG2Option extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinJPG2Option reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinJPG2Option()
- {
- quality = 16;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 a8889789ef1..218bc1ee580 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 d39b80c3b7f..db795a7d9b8 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 91e4be1aeb1..f2b7ba76d61 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java
index 7e6f5dc8bc6..67e87719ae3 100644
--- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java
+++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinLogEventHandler.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 cbb3862a54c..376a5b9875c 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -39,13 +39,12 @@ public class spinMJPGOption extends Pointer {
/** Image quality (1-100) */
public native @Cast("unsigned int") int quality(); public native spinMJPGOption quality(int setter);
+ /** Width of source image */
+ public native @Cast("unsigned int") int width(); public native spinMJPGOption width(int setter);
+
+ /** Height of source image */
+ public native @Cast("unsigned int") int height(); public native spinMJPGOption height(int setter);
+
public native @Cast("unsigned int") int reserved(int i); public native spinMJPGOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinMJPGOption()
- {
- frameRate = 15.0;
- quality = 75;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 033b8203b17..5962700a6d8 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 1544715570f..ee509c95285 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 8eb69add046..c238c0764d3 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 3caa84a170e..173c3f02fb9 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 aaa5f5423c7..d9c0304ca6c 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -35,10 +35,4 @@ public class spinPGMOption extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinPGMOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinPGMOption()
- {
- binaryFile = true;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 1dae96c5af2..4f30a7c97a7 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -49,11 +49,4 @@ public class spinPNGOption extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinPNGOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinPNGOption()
- {
- interlaced = FALSE;
- compressionLevel = 6;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 865b174d332..292c33ea355 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -38,10 +38,4 @@ public class spinPPMOption extends Pointer {
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinPPMOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinPPMOption()
- {
- binaryFile = true;
- memset(reserved, 0, sizeof(reserved));
- }*/
}
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 26ce2c3fd17..6921012e375 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -18,5 +18,5 @@ public class spinRemovalEventFunction extends FunctionPointer {
public spinRemovalEventFunction(Pointer p) { super(p); }
protected spinRemovalEventFunction() { allocate(); }
private native void allocate();
- public native void call(@Cast("uint64_t") int deviceSerialNumber, Pointer pUserData);
+ public native void call(spinCamera hCamera, Pointer pUserData);
}
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 bcc0cfa14f7..dce910c8928 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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 107001cd471..8ec74705780 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
@@ -34,15 +34,8 @@ public class spinTIFFOption extends Pointer {
}
/** Compression method to use for encoding TIFF images. */
- public native spinCompressionMethod compression(); public native spinTIFFOption compression(spinCompressionMethod setter);
+ public native spinTIFFCompressionMethod compression(); public native spinTIFFOption compression(spinTIFFCompressionMethod setter);
/** Reserved for future use. */
public native @Cast("unsigned int") int reserved(int i); public native spinTIFFOption reserved(int i, int setter);
@MemberGetter public native @Cast("unsigned int*") IntPointer reserved();
- /*
- _spinTIFFOption()
- {
- compression = LZW;
- memset(reserved, 0, sizeof(reserved));
- };
- */
}
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 e030b689c5c..bf8a2cfaa5b 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
package org.bytedeco.spinnaker.Spinnaker_C;
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 332da5fd938..cb599227b87 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.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-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-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -54,6 +54,14 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
/* Function declaration modifiers */
// #if defined(_WIN32) || defined(_WIN64)
+// #if _MSC_VER >= 1900
+// #define SPINNAKER_DEPRECATED_API
+// #elif _MSC_VER == 1800
+// #define SPINNAKER_DEPRECATED_API __declspec(deprecated("Spinnaker support for Visual Studio 2013 is deprecated, please upgrade to Visual Studio 2015 instead"))
+// #elif _MSC_VER == 1600
+// #define SPINNAKER_DEPRECATED_API __declspec(deprecated("Spinnaker support for Visual Studio 2010 is deprecated, please upgrade to Visual Studio 2015 instead"))
+// #endif
+
// Windows 32-bit and 64-bit
// #ifndef SPINC_NO_DECLSPEC_STATEMENTS
// #else
@@ -109,9 +117,11 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
// #ifdef __GNUC__
// #define SPINNAKERC_API_DEPRECATED(msg, func)
// SPINC_IMPORT_EXPORT spinError SPINC_CALLTYPE func __attribute__((deprecated(msg)))
+// #define SPINNAKERC_STRUCT_DEPRECATED(msg) struct __attribute__((deprecated(msg)))
// #elif defined(_MSC_VER)
// #define SPINNAKERC_API_DEPRECATED(msg, func)
// __declspec(deprecated(msg)) SPINC_IMPORT_EXPORT spinError SPINC_CALLTYPE func
+// #define SPINNAKERC_STRUCT_DEPRECATED(msg) __declspec(deprecated(msg)) struct
// #endif
// #endif
@@ -123,7 +133,7 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
// Parsed from
//=============================================================================
-// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -177,6 +187,12 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
// Targeting ../Spinnaker_C/spinImage.java
+// Targeting ../Spinnaker_C/spinImageList.java
+
+
+// Targeting ../Spinnaker_C/spinImageProcessor.java
+
+
// Targeting ../Spinnaker_C/spinImageStatistics.java
@@ -186,6 +202,9 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
// Targeting ../Spinnaker_C/spinImageEventHandler.java
+// Targeting ../Spinnaker_C/spinImageListEventHandler.java
+
+
// Targeting ../Spinnaker_C/spinDeviceArrivalEventHandler.java
@@ -213,6 +232,9 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C {
// Targeting ../Spinnaker_C/spinImageEventFunction.java
+// Targeting ../Spinnaker_C/spinImageListEventFunction.java
+
+
// Targeting ../Spinnaker_C/spinArrivalEventFunction.java
@@ -278,16 +300,16 @@ public enum spinError {
* The error codes in the range of -2000 to -2999 are reserved for
* Gen API related errors.
*/
- GENICAM_ERR_INVALID_ARGUMENT(-2001),
- GENICAM_ERR_OUT_OF_RANGE(-2002),
- GENICAM_ERR_PROPERTY(-2003),
- GENICAM_ERR_RUN_TIME(-2004),
- GENICAM_ERR_LOGICAL(-2005),
- GENICAM_ERR_ACCESS(-2006),
- GENICAM_ERR_TIMEOUT(-2007),
- GENICAM_ERR_DYNAMIC_CAST(-2008),
- GENICAM_ERR_GENERIC(-2009),
- GENICAM_ERR_BAD_ALLOCATION(-2010),
+ SPINNAKER_ERR_GENICAM_INVALID_ARGUMENT(-2001),
+ SPINNAKER_ERR_GENICAM_OUT_OF_RANGE(-2002),
+ SPINNAKER_ERR_GENICAM_PROPERTY(-2003),
+ SPINNAKER_ERR_GENICAM_RUN_TIME(-2004),
+ SPINNAKER_ERR_GENICAM_LOGICAL(-2005),
+ SPINNAKER_ERR_GENICAM_ACCESS(-2006),
+ SPINNAKER_ERR_GENICAM_TIMEOUT(-2007),
+ SPINNAKER_ERR_GENICAM_DYNAMIC_CAST(-2008),
+ SPINNAKER_ERR_GENICAM_GENERIC(-2009),
+ SPINNAKER_ERR_GENICAM_BAD_ALLOCATION(-2010),
/**
* The error codes in the range of -3000 to -3999 are reserved for
@@ -322,34 +344,32 @@ public enum spinError {
* for complete details for each algorithm.
*/
public enum spinColorProcessingAlgorithm {
- /** Default method. */
- DEFAULT(0),
/** No color processing. */
- NO_COLOR_PROCESSING(1),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_NONE(0),
/**
* Fastest but lowest quality. Equivalent to
* FLYCAPTURE_NEAREST_NEIGHBOR_FAST in FlyCapture.
*/
- NEAREST_NEIGHBOR(2),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_NEAREST_NEIGHBOR(1),
/**
* Nearest Neighbor with averaged green pixels. Higher quality but slower
* compared to nearest neighbor without averaging.
*/
- NEAREST_NEIGHBOR_AVG(3),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_NEAREST_NEIGHBOR_AVG(2),
/** Weighted average of surrounding 4 pixels in a 2x2 neighborhood. */
- BILINEAR(4),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_BILINEAR(3),
/** Weights surrounding pixels based on localized edge orientation. */
- EDGE_SENSING(5),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_EDGE_SENSING(4),
/** Well-balanced speed and quality. */
- HQ_LINEAR(6),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_HQ_LINEAR(5),
/** Multi-threaded with similar results to edge sensing. */
- IPP(7),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_IPP(6),
/** Best quality but much faster than rigorous. */
- DIRECTIONAL_FILTER(8),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_DIRECTIONAL_FILTER(7),
/** Slowest but produces good results. */
- RIGOROUS(9),
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_RIGOROUS(8),
/** Weighted pixel average from different directions. */
- WEIGHTED_DIRECTIONAL_FILTER(10);
+ SPINNAKER_COLOR_PROCESSING_ALGORITHM_WEIGHTED_DIRECTIONAL_FILTER(9);
public final int value;
private spinColorProcessingAlgorithm(int v) { this.value = v; }
@@ -362,14 +382,14 @@ public enum spinColorProcessingAlgorithm {
* Channels that allow statistics to be calculated.
*/
public enum spinStatisticsChannel {
- GREY(0),
- RED(1),
- GREEN(2),
- BLUE(3),
- HUE(4),
- SATURATION(5),
- LIGHTNESS(6),
- NUM_STATISTICS_CHANNELS(7);
+ SPINNAKER_STATISTICS_CHANNEL_GREY(0),
+ SPINNAKER_STATISTICS_CHANNEL_RED(1),
+ SPINNAKER_STATISTICS_CHANNEL_GREEN(2),
+ SPINNAKER_STATISTICS_CHANNEL_BLUE(3),
+ SPINNAKER_STATISTICS_CHANNEL_HUE(4),
+ SPINNAKER_STATISTICS_CHANNEL_SATURATION(5),
+ SPINNAKER_STATISTICS_CHANNEL_LIGHTNESS(6),
+ SPINNAKER_STATISTICS_CHANNEL_NUM_CHANNELS(7);
public final int value;
private spinStatisticsChannel(int v) { this.value = v; }
@@ -381,24 +401,24 @@ public enum spinStatisticsChannel {
/** File formats to be used for saving images to disk. */
public enum spinImageFileFormat {
/** Determine file format from file extension. */
- FROM_FILE_EXT(-1),
+ SPINNAKER_IMAGE_FILE_FORMAT_FROM_FILE_EXT(-1),
/** Portable gray map. */
- PGM(0),
+ SPINNAKER_IMAGE_FILE_FORMAT_PGM(0),
/** Portable pixmap. */
- PPM(1),
+ SPINNAKER_IMAGE_FILE_FORMAT_PPM(1),
/** Bitmap. */
- BMP(2),
+ SPINNAKER_IMAGE_FILE_FORMAT_BMP(2),
/** JPEG. */
- JPEG(3),
+ SPINNAKER_IMAGE_FILE_FORMAT_JPEG(3),
/** JPEG 2000. */
- JPEG2000(4),
+ SPINNAKER_IMAGE_FILE_FORMAT_JPEG2000(4),
/** Tagged image file format. */
- TIFF(5),
+ SPINNAKER_IMAGE_FILE_FORMAT_TIFF(5),
/** Portable network graphics. */
- PNG(6),
+ SPINNAKER_IMAGE_FILE_FORMAT_PNG(6),
/** Raw data. */
- RAW(7),
- IMAGE_FILE_FORMAT_FORCE_32BITS(0x7FFFFFFF);
+ SPINNAKER_IMAGE_FILE_FORMAT_RAW(7),
+ SPINNAKER_IMAGE_FILE_FORMAT_FORCE_32BITS(0x7FFFFFFF);
public final int value;
private spinImageFileFormat(int v) { this.value = v; }
@@ -417,56 +437,56 @@ public enum spinImageFileFormat {
*
* @see spinImageGetTLPixelFormatNamespace()
*/
-public enum spinPixelFormatNamespaceID {
- SPINNAKER_PIXELFORMAT_NAMESPACE_UNKNOWN(0), /* GenTL v1.2 */
- SPINNAKER_PIXELFORMAT_NAMESPACE_GEV(1), /* GenTL v1.2 */
- SPINNAKER_PIXELFORMAT_NAMESPACE_IIDC(2), /* GenTL v1.2 */
- SPINNAKER_PIXELFORMAT_NAMESPACE_PFNC_16BIT(3), /* GenTL v1.4 */
- SPINNAKER_PIXELFORMAT_NAMESPACE_PFNC_32BIT(4), /* GenTL v1.4 */
+public enum spinTLPixelFormatNamespace {
+ SPINNAKER_TLPIXELFORMAT_NAMESPACE_UNKNOWN(0), /* GenTL v1.2 */
+ SPINNAKER_TLPIXELFORMAT_NAMESPACE_GEV(1), /* GenTL v1.2 */
+ SPINNAKER_TLPIXELFORMAT_NAMESPACE_IIDC(2), /* GenTL v1.2 */
+ SPINNAKER_TLPIXELFORMAT_NAMESPACE_PFNC_16BIT(3), /* GenTL v1.4 */
+ SPINNAKER_TLPIXELFORMAT_NAMESPACE_PFNC_32BIT(4), /* GenTL v1.4 */
SPINNAKER_PIXELFORMAT_NAMESPACE_CUSTOM_ID(1000);
public final int value;
- private spinPixelFormatNamespaceID(int v) { this.value = v; }
- private spinPixelFormatNamespaceID(spinPixelFormatNamespaceID e) { this.value = e.value; }
- public spinPixelFormatNamespaceID intern() { for (spinPixelFormatNamespaceID e : values()) if (e.value == value) return e; return this; }
+ private spinTLPixelFormatNamespace(int v) { this.value = v; }
+ private spinTLPixelFormatNamespace(spinTLPixelFormatNamespace e) { this.value = e.value; }
+ public spinTLPixelFormatNamespace intern() { for (spinTLPixelFormatNamespace e : values()) if (e.value == value) return e; return this; }
@Override public String toString() { return intern().name(); }
}
/** Status of images returned from spinImageGetStatus() call. */
public enum spinImageStatus {
/** Image has an unknown error. */
- IMAGE_UNKNOWN_ERROR(-1),
+ SPINNAKER_IMAGE_STATUS_UNKNOWN_ERROR(-1),
/** Image is returned from GetNextImage() call without any errors. */
- IMAGE_NO_ERROR(0),
+ SPINNAKER_IMAGE_STATUS_NO_ERROR(0),
/** Image failed CRC check. */
- IMAGE_CRC_CHECK_FAILED(1),
+ SPINNAKER_IMAGE_STATUS_CRC_CHECK_FAILED(1),
/** Received more data than the size of the image. */
- IMAGE_DATA_OVERFLOW(2),
+ SPINNAKER_IMAGE_STATUS_DATA_OVERFLOW(2),
/** 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),
+ SPINNAKER_IMAGE_STATUS_MISSING_PACKETS(3),
/** Image leader is incomplete. Could be caused by missing packet(s). See link above.*/
- IMAGE_LEADER_BUFFER_SIZE_INCONSISTENT(4),
+ SPINNAKER_IMAGE_STATUS_LEADER_BUFFER_SIZE_INCONSISTENT(4),
/** Image trailer is incomplete. Could be caused by missing packet(s). See link above.*/
- IMAGE_TRAILER_BUFFER_SIZE_INCONSISTENT(5),
+ SPINNAKER_IMAGE_STATUS_TRAILER_BUFFER_SIZE_INCONSISTENT(5),
/** Image has an inconsistent packet id. Could be caused by missing packet(s). See link above.*/
- IMAGE_PACKETID_INCONSISTENT(6),
+ SPINNAKER_IMAGE_STATUS_PACKETID_INCONSISTENT(6),
/** Image leader is missing. Could be caused by missing packet(s). See link above.*/
- IMAGE_MISSING_LEADER(7),
+ SPINNAKER_IMAGE_STATUS_MISSING_LEADER(7),
/** Image trailer is missing. Could be caused by missing packet(s). See link above.*/
- IMAGE_MISSING_TRAILER(8),
+ SPINNAKER_IMAGE_STATUS_MISSING_TRAILER(8),
/** Image data is incomplete. Could be caused by missing packet(s). See link above.*/
- IMAGE_DATA_INCOMPLETE(9),
+ SPINNAKER_IMAGE_STATUS_DATA_INCOMPLETE(9),
/** Image info is corrupted. Could be caused by missing packet(s). See link above.*/
- IMAGE_INFO_INCONSISTENT(10),
+ SPINNAKER_IMAGE_STATUS_INFO_INCONSISTENT(10),
/** Image chunk data is invalid */
- IMAGE_CHUNK_DATA_INVALID(11),
+ SPINNAKER_IMAGE_STATUS_CHUNK_DATA_INVALID(11),
/** Image cannot be processed due to lack of system
resources. */
- IMAGE_NO_SYSTEM_RESOURCES(12);
+ SPINNAKER_IMAGE_STATUS_NO_SYSTEM_RESOURCES(12);
public final int value;
private spinImageStatus(int v) { this.value = v; }
@@ -477,18 +497,20 @@ public enum spinImageStatus {
/** log levels */
public enum spinnakerLogLevel {
- LOG_LEVEL_OFF(-1), // Logging is off.
- LOG_LEVEL_FATAL(0), // Not used by Spinnaker.
- LOG_LEVEL_ALERT(100), // Not used by Spinnaker.
- LOG_LEVEL_CRIT(200), // Not used by Spinnaker.
- LOG_LEVEL_ERROR(300), // Failures that are non-recoverable without user intervention.
- LOG_LEVEL_WARN(400), // Failures that are recoverable without user intervention.
- LOG_LEVEL_NOTICE(500), // Events such as camera arrival and removal, initialization and deinitialization, starting
- // and stopping image acquisition, and feature modification.
- LOG_LEVEL_INFO(600), // Information about recurring events that are generated regularly such as information on
- // individual images.
- LOG_LEVEL_DEBUG(700), // Information that can be used to troubleshoot the system.
- LOG_LEVEL_NOTSET(800); // Logs everything.
+ SPINNAKER_LOG_LEVEL_OFF(-1), // Logging is off.
+ SPINNAKER_LOG_LEVEL_FATAL(0), // Failures that are non-recoverable without user intervention.
+ SPINNAKER_LOG_LEVEL_ALERT(100), // Not used by Spinnaker.
+ SPINNAKER_LOG_LEVEL_CRIT(200), // Not used by Spinnaker.
+ SPINNAKER_LOG_LEVEL_ERROR(300), // Failures that may or may not be recoverable without user
+ // intervention (use case dependent).
+ SPINNAKER_LOG_LEVEL_WARN(400), // Failures that are recoverable without user intervention.
+ SPINNAKER_LOG_LEVEL_NOTICE(500), // Events such as camera arrival and removal, initialization
+ // and deinitialization, starting and stopping image acquisition,
+ // and feature modification.
+ SPINNAKER_LOG_LEVEL_INFO(600), // Information about recurring events that are generated regularly
+ // such as information on individual images.
+ SPINNAKER_LOG_LEVEL_DEBUG(700), // Information that can be used to troubleshoot the system.
+ SPINNAKER_LOG_LEVEL_NOTSET(800); // Logs everything.
public final int value;
private spinnakerLogLevel(int v) { this.value = v; }
@@ -498,72 +520,96 @@ public enum spinnakerLogLevel {
}
/* Enumeration of TLType dependent payload types. Introduced in GenTL v1.2 */
-public enum spinPayloadTypeInfoIDs {
- PAYLOAD_TYPE_UNKNOWN(0), /* GenTL v1.2 */
- PAYLOAD_TYPE_IMAGE(1), /* GenTL v1.2 */
- PAYLOAD_TYPE_RAW_DATA(2), /* GenTL v1.2 */
- PAYLOAD_TYPE_FILE(3), /* GenTL v1.2 */
- PAYLOAD_TYPE_CHUNK_DATA(4), /* GenTL v1.2, Deprecated in GenTL 1.5*/
- PAYLOAD_TYPE_JPEG(5), /* GenTL v1.4 */
- PAYLOAD_TYPE_JPEG2000(6), /* GenTL v1.4 */
- PAYLOAD_TYPE_H264(7), /* GenTL v1.4 */
- PAYLOAD_TYPE_CHUNK_ONLY(8), /* GenTL v1.4 */
- PAYLOAD_TYPE_DEVICE_SPECIFIC(9), /* GenTL v1.4 */
- 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_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; }
- private spinPayloadTypeInfoIDs(spinPayloadTypeInfoIDs e) { this.value = e.value; }
- public spinPayloadTypeInfoIDs intern() { for (spinPayloadTypeInfoIDs e : values()) if (e.value == value) return e; return this; }
+public enum spinTLPayloadType {
+ SPINNAKER_TLPAYLOAD_TYPE_UNKNOWN(0), /* GenTL v1.2 */
+ SPINNAKER_TLPAYLOAD_TYPE_IMAGE(1), /* GenTL v1.2 */
+ SPINNAKER_TLPAYLOAD_TYPE_RAW_DATA(2), /* GenTL v1.2 */
+ SPINNAKER_TLPAYLOAD_TYPE_FILE(3), /* GenTL v1.2 */
+ SPINNAKER_TLPAYLOAD_TYPE_CHUNK_DATA(4), /* GenTL v1.2, Deprecated in GenTL 1.5*/
+ SPINNAKER_TLPAYLOAD_TYPE_JPEG(5), /* GenTL v1.4 */
+ SPINNAKER_TLPAYLOAD_TYPE_JPEG2000(6), /* GenTL v1.4 */
+ SPINNAKER_TLPAYLOAD_TYPE_H264(7), /* GenTL v1.4 */
+ SPINNAKER_TLPAYLOAD_TYPE_CHUNK_ONLY(8), /* GenTL v1.4 */
+ SPINNAKER_TLPAYLOAD_TYPE_DEVICE_SPECIFIC(9), /* GenTL v1.4 */
+ SPINNAKER_TLPAYLOAD_TYPE_MULTI_PART(10), /* GenTL v1.5 */
+
+ SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID(1000);
+
+ public final int value;
+ private spinTLPayloadType(int v) { this.value = v; }
+ private spinTLPayloadType(spinTLPayloadType e) { this.value = e.value; }
+ public spinTLPayloadType intern() { for (spinTLPayloadType e : values()) if (e.value == value) return e; return this; }
@Override public String toString() { return intern().name(); }
}
-// Targeting ../Spinnaker_C/spinPNGOption.java
+/** Compression method to use for encoding TIFF images. */
+public enum spinTIFFCompressionMethod {
+ SPINNAKER_TIFF_COMPRESS_METHOD_NONE(1), // Save without any compression.
+ SPINNAKER_TIFF_COMPRESS_METHOD_PACKBITS(2), // Save using PACKBITS compression.
+ SPINNAKER_TIFF_COMPRESS_METHOD_DEFLATE(3), // Save using DEFLATE compression (ZLIB compression).
+ SPINNAKER_TIFF_COMPRESS_METHOD_ADOBE_DEFLATE(4), // Save using ADOBE DEFLATE compression
-// Targeting ../Spinnaker_C/spinPPMOption.java
+ // Save using CCITT Group 3 fax encoding. This is only valid for
+ // 1-bit images only. Default to LZW for other bit depths.
+ //
+ SPINNAKER_TIFF_COMPRESS_METHOD_CCITTFAX3(5),
+ // Save using CCITT Group 4 fax encoding. This is only valid for
+ // 1-bit images only. Default to LZW for other bit depths.
-// Targeting ../Spinnaker_C/spinPGMOption.java
+ SPINNAKER_TIFF_COMPRESS_METHOD_CCITTFAX4(6),
+ SPINNAKER_TIFF_COMPRESS_METHOD_LZW(7), //< Save using LZW compression.
+ //
+ // Save using JPEG compression. This is only valid for 8-bit
+ // greyscale and 24-bit only. Default to LZW for other bit depths.
+ //
+ SPINNAKER_TIFF_COMPRESS_METHOD_JPG(8);
+ public final int value;
+ private spinTIFFCompressionMethod(int v) { this.value = v; }
+ private spinTIFFCompressionMethod(spinTIFFCompressionMethod e) { this.value = e.value; }
+ public spinTIFFCompressionMethod intern() { for (spinTIFFCompressionMethod e : values()) if (e.value == value) return e; return this; }
+ @Override public String toString() { return intern().name(); }
+}
-/** Compression method used in saving TIFF images in the spinTIFFOption struct. */
-public enum spinCompressionMethod {
- NONE(1), // Save without any compression.
- PACKBITS(2), // Save using PACKBITS compression.
- DEFLATE(3), // Save using DEFLATE compression (ZLIB compression).
- ADOBE_DEFLATE(4), // Save using ADOBE DEFLATE compression
+/**
+* Possible Status Codes Returned from Action Command.
+*/
+public enum spinActionCommandStatus {
+ /** The device acknowledged the command. */
+ SPINNAKER_ACTION_COMMAND_STATUS_OK(0),
- // Save using CCITT Group 3 fax encoding. This is only valid for
- // 1-bit images only. Default to LZW for other bit depths.
- //
- CCITTFAX3(5),
+ /* The device is not synchronized to a master clock to be used as time reference. Typically used when scheduled
+ action commands cannot be scheduled for a future time since the reference time coming from IEEE 1588 is not
+ locked. */
+ SPINNAKER_ACTION_COMMAND_STATUS_NO_REF_TIME(0x8013),
- // Save using CCITT Group 4 fax encoding. This is only valid for
- // 1-bit images only. Default to LZW for other bit depths.
+ /* Returned when the scheduled action commands queue is full and the device cannot accept the additional request. */
+ SPINNAKER_ACTION_COMMAND_STATUS_OVERFLOW(0x8015),
+
+ /* The requested scheduled action command was requested at a point in time that is in the past. */
+ SPINNAKER_ACTION_COMMAND_STATUS_ACTION_LATE(0x8016),
- CCITTFAX4(6),
- LZW(7), //< Save using LZW compression.
- //
- // Save using JPEG compression. This is only valid for 8-bit
- // greyscale and 24-bit only. Default to LZW for other bit depths.
- //
- JPG(8);
+ /* Generic Error. Try enabling the Extended Status Code 2.0 bit on gvcp configuration register in order to receive
+ more meaningful/detailed acknowledge messages from the device. */
+ SPINNAKER_ACTION_COMMAND_STATUS_ERROR(0x8FFF);
public final int value;
- private spinCompressionMethod(int v) { this.value = v; }
- private spinCompressionMethod(spinCompressionMethod e) { this.value = e.value; }
- public spinCompressionMethod intern() { for (spinCompressionMethod e : values()) if (e.value == value) return e; return this; }
+ private spinActionCommandStatus(int v) { this.value = v; }
+ private spinActionCommandStatus(spinActionCommandStatus e) { this.value = e.value; }
+ public spinActionCommandStatus intern() { for (spinActionCommandStatus e : values()) if (e.value == value) return e; return this; }
@Override public String toString() { return intern().name(); }
}
+// Targeting ../Spinnaker_C/spinPNGOption.java
+
+
+// Targeting ../Spinnaker_C/spinPPMOption.java
+
+
+// Targeting ../Spinnaker_C/spinPGMOption.java
+
+
// Targeting ../Spinnaker_C/spinTIFFOption.java
@@ -588,35 +634,6 @@ public enum spinCompressionMethod {
// Targeting ../Spinnaker_C/spinLibraryVersion.java
-
-/**
- * Possible Status Codes Returned from Action Command.
- */
-public enum actionCommandStatus {
- /** The device acknowledged the command. */
- ACTION_COMMAND_STATUS_OK(0),
-
- /* The device is not synchronized to a master clock to be used as time reference. Typically used when scheduled
- action commands cannot be scheduled for a future time since the reference time coming from IEEE 1588 is not
- locked. */
- ACTION_COMMAND_STATUS_NO_REF_TIME(0x8013),
-
- /* Returned when the scheduled action commands queue is full and the device cannot accept the additional request. */
- ACTION_COMMAND_STATUS_OVERFLOW(0x8015),
-
- /* The requested scheduled action command was requested at a point in time that is in the past. */
- ACTION_COMMAND_STATUS_ACTION_LATE(0x8016),
-
- /* Generic Error. Try enabling the Extended Status Code 2.0 bit on gvcp configuration register in order to receive
- more meaningful/detailed acknowledge messages from the device. */
- ACTION_COMMAND_STATUS_ERROR(0x8FFF);
-
- public final int value;
- private actionCommandStatus(int v) { this.value = v; }
- private actionCommandStatus(actionCommandStatus e) { this.value = e.value; }
- public actionCommandStatus intern() { for (actionCommandStatus e : values()) if (e.value == value) return e; return this; }
- @Override public String toString() { return intern().name(); }
-}
// Targeting ../Spinnaker_C/actionCommandResult.java
@@ -630,7 +647,7 @@ public enum actionCommandStatus {
// Parsed from
//=============================================================================
-// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -2707,8 +2724,12 @@ public enum spinPixelFormatEnums {
PixelFormat_GB12_Jpeg(249),
/** Blue 12-bit packed JPEG.*/
PixelFormat_B12_Jpeg(250),
- UNKNOWN_PIXELFORMAT(251),
- NUM_PIXELFORMAT(252);
+ /** Green-Red (single) channel from Bayer pattern 12-bit.*/
+ PixelFormat_GR12(251),
+ /** Green-Blue (single) channel from Bayer pattern 12-bit.*/
+ PixelFormat_GB12(252),
+ UNKNOWN_PIXELFORMAT(253),
+ NUM_PIXELFORMAT(254);
public final int value;
private spinPixelFormatEnums(int v) { this.value = v; }
@@ -5536,7 +5557,7 @@ public enum spinCxpPoCxpStatusEnums {
// Parsed from
//=============================================================================
-// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -7070,7 +7091,7 @@ public static native spinError spinRegisterGetEx(
// Parsed from
//=============================================================================
-// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -7722,7 +7743,7 @@ public static native spinError spinSystemUnregisterInterfaceEventHandler(
* Removes a camera from a camera list using its serial number
* @see spinError
*
- * @param hCameraList The camera of the camera to remove
+ * @param hCameraList The camera list of the camera to remove
* @param pSerial The serial number of the camera to remove
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
@@ -7731,6 +7752,166 @@ public static native spinError spinSystemUnregisterInterfaceEventHandler(
public static native @Cast("spinError") int spinCameraListRemoveBySerial(spinCameraList hCameraList, String pSerial);
/*@}*/
+ /**
+ * \defgroup CImageList ImageList Access
+ *
+ * \brief The functions in this section provide access to information,
+ * objects, and functionality of image lists. This includes updating,
+ * size and image retrieval, and clearance.
+ */
+ /*@{*/
+
+ /**
+ * Creates an empty image list (image lists created this way must be destroyed)
+ * @see spinError
+ *
+ * @param phImageList The image list handle pointer in which the empty image list is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListCreateEmpty(@ByPtrPtr spinImageList phImageList);
+
+ /**
+ * Destroys a image list
+ * @see spinError
+ *
+ * @param hImageList The image list to destroy
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListDestroy(spinImageList hImageList);
+
+ /**
+ * Retrieves the number of images in an image list
+ * @see spinError
+ *
+ * @param hImageList The image list where the images to be counted are
+ * @param pSize The unsigned integer pointer in which the number of images is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListGetSize(spinImageList hImageList, @Cast("size_t*") SizeTPointer pSize);
+
+ /**
+ * Retrieves a image from a image list using an index. This function will return
+ * a SPINNAKER_ERR_INVALID_PARAMETER error if the input index is out of range.
+ * @see spinError
+ *
+ * @param hImageList The image list of the image to retrieve
+ * @param index The index of the image
+ * @param phImage The image handle pointer in which the image is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListGet(spinImageList hImageList, @Cast("size_t") long index, @ByPtrPtr spinImage phImage);
+
+ /**
+ * Clears a image list
+ * @see spinError
+ *
+ * @param hImageList The image list to clear
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListClear(spinImageList hImageList);
+
+ /**
+ * Removes a image from a image list using its index
+ * @see spinError
+ *
+ * @param hImageList The image list of the camera to remove
+ * @param index The index of the image to remove
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListRemove(spinImageList hImageList, @Cast("size_t") long index);
+
+ /**
+ * Appends all the images from one image list to another
+ * @see spinError
+ *
+ * @param hImageListBase The image list to receive the other
+ * @param hImageListToAppend The image list to add to the other
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListAppend(spinImageList hImageListBase, spinImageList hImageListToAppend);
+
+ /**
+ * Retrieves a image from a image list given its pixel format. This
+ * function will return a NULL spinImage pointer if no matching image
+ * pixel format is found.
+ * @see spinError
+ *
+ * @param hImageList The image list of the image to retrieve
+ * @param pixelFormat The pixel format of the image to retrieve
+ * @param phImage The image handle pointer in which the image is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListGetByPixelFormat(
+ spinImageList hImageList,
+ spinPixelFormatEnums pixelFormat,
+ @ByPtrPtr spinImage phImage);
+ public static native @Cast("spinError") int spinImageListGetByPixelFormat(
+ spinImageList hImageList,
+ @Cast("spinPixelFormatEnums") int pixelFormat,
+ @ByPtrPtr spinImage phImage);
+
+ /**
+ * Removes a image from a image list using its pixel format
+ * @see spinError
+ *
+ * @param hImageList The image list of the image to remove
+ * @param pixelFormat The pixel format of the image to remove
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListRemoveByPixelFormat(spinImageList hImageList, spinPixelFormatEnums pixelFormat);
+ public static native @Cast("spinError") int spinImageListRemoveByPixelFormat(spinImageList hImageList, @Cast("spinPixelFormatEnums") int pixelFormat);
+
+ /*
+ * Releases all the images that were acquired calling spinCameraGetNextImageSync().
+ * @see spinCameraInit()
+ * @see spinCameraGetNextImageSync(grabTimeout)
+ * @see spinImageRelease(spinImage hImage)
+ * @see spinError
+ *
+ * @param hImageList The image list of the image to remove
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListRelease(spinImageList hImageList);
+
+ /**
+ * Saves an image list as an object to a file.
+ * @see spinImageListLoad()
+ * @see spinError
+ *
+ * @param hImageList The image list of the image to remove
+ * @param fileName Name of the file to save the current image list object to.
+ * It is recommended to use the file extension 'sil'.
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListSave(spinImageList hImageList, @Cast("const char*") BytePointer fileName);
+ public static native @Cast("spinError") int spinImageListSave(spinImageList hImageList, String fileName);
+
+ /**
+ * Creates an image list object from file.
+ * @see spinImageListSave()
+ * @see spinError
+ *
+ * @param phImageList The image list handle pointer in which the empty image list is returned
+ * @param fileName Name of the file to load an image object from.
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListLoad(@ByPtrPtr spinImageList phImageList, @Cast("const char*") BytePointer fileName);
+ public static native @Cast("spinError") int spinImageListLoad(@ByPtrPtr spinImageList phImageList, String fileName);
+
+ /*@}*/
+
/**
* \defgroup CInterface Interface Access
*
@@ -8016,7 +8197,7 @@ public static native spinError spinInterfaceUnregisterInterfaceEventHandler(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinCameraReadPort(spinCamera hCamera, @Cast("uint64_t") int iAddress, Pointer pBuffer, @Cast("size_t") long iSize);
+ public static native spinError spinCameraReadPort(spinCamera hCamera, @Cast("uint64_t") long iAddress, Pointer pBuffer, @Cast("size_t") long iSize);
/*
* Writes a remote port on a physical Camera. This function can be used to write
@@ -8034,7 +8215,7 @@ public static native spinError spinInterfaceUnregisterInterfaceEventHandler(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinCameraWritePort(spinCamera hCamera, @Cast("uint64_t") int iAddress, Pointer pBuffer, @Cast("size_t") long iSize);
+ public static native spinError spinCameraWritePort(spinCamera hCamera, @Cast("uint64_t") long iAddress, Pointer pBuffer, @Cast("size_t") long iSize);
/**
* Has a camera start acquiring images
@@ -8072,12 +8253,28 @@ public static native spinError spinInterfaceUnregisterInterfaceEventHandler(
* @see spinError
*
* @param hCamera The camera of the image to retrieve
- * @param grabTimeout The timeout value for returned an image
+ * @param grabTimeout A 64bit value that represents a timeout in milliseconds
* @param phImage The image handle pointer in which the image is returned
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinCameraGetNextImageEx(spinCamera hCamera, @Cast("uint64_t") int grabTimeout, @ByPtrPtr spinImage phImage);
+ public static native spinError spinCameraGetNextImageEx(spinCamera hCamera, @Cast("uint64_t") long grabTimeout, @ByPtrPtr spinImage phImage);
+
+ /**
+ * If a camera supports one or more streams, this function gets one image from each
+ * of the camera's streams, and returns the images in a list. This function
+ * will block for the specified timeout period until an image arrives on all the streams.
+ *
+ * @see spinCameraInit()
+ * @see spinCameraBeginAcquisition()
+ * @see spinCameraEndAcquisition()
+ *
+ * @param hCamera The camera of the image to retrieve
+ * @param grabTimeout A 64bit value that represents a timeout in milliseconds
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinCameraGetNextImageSync(spinCamera hCamera, @Cast("uint64_t") long grabTimeout, @ByPtrPtr spinImageList phImageList);
/**
* Retrieves a unique identifier for a camera
@@ -8176,6 +8373,23 @@ public static native spinError spinCameraUnregisterDeviceEventHandler(
*/
public static native spinError spinCameraRegisterImageEventHandler(spinCamera hCamera, spinImageEventHandler hImageEventHandler);
+ /**
+ * Registers an image event handler to a camera
+ * Registers a specific stream handler for the camera given a stream index. The camera has to be
+ * initialized first with a call to spinCameraInit() before registering handlers for events.
+ * @see spinError
+ *
+ * @param hCamera The camera on which to register the image event handler
+ * @param hImageEventHandler The image event handler to register
+ * @param streamIndex The index of the stream of where this handler will be registered to
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinCameraRegisterImageEventHandlerEx(
+ spinCamera hCamera,
+ spinImageEventHandler hImageEventHandler,
+ @Cast("uint64_t") long streamIndex);
+
/**
* Unregisters an image event handler from a camera
* @see spinError
@@ -8187,6 +8401,32 @@ public static native spinError spinCameraUnregisterDeviceEventHandler(
*/
public static native spinError spinCameraUnregisterImageEventHandler(spinCamera hCamera, spinImageEventHandler hImageEventHandler);
+ /**
+ * Registers an image list event handler to a camera
+ * @see spinError
+ *
+ * @param hCamera The camera on which to register the image event handler
+ * @param hImageListEventHandler The image list event handler to register
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinCameraRegisterImageListEventHandler(
+ spinCamera hCamera,
+ spinImageListEventHandler hImageListEventHandler);
+
+ /**
+ * Unregisters an image list event handler from a camera
+ * @see spinError
+ *
+ * @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 spinCameraUnregisterImageListEventHandler(
+ spinCamera hCamera,
+ spinImageListEventHandler hImageListEventHandler);
+
/**
* Releases a camera
* @see spinError
@@ -8342,7 +8582,7 @@ public static native spinError spinImageCreateEx2(
@Cast("size_t") long offsetY,
spinPixelFormatEnums pixelFormat,
Pointer pData,
- spinPayloadTypeInfoIDs dataPayloadType,
+ spinTLPayloadType dataPayloadType,
@Cast("size_t") long dataSize);
public static native @Cast("spinError") int spinImageCreateEx2(
@ByPtrPtr spinImage phImage,
@@ -8352,7 +8592,7 @@ public static native spinError spinImageCreateEx2(
@Cast("size_t") long offsetY,
@Cast("spinPixelFormatEnums") int pixelFormat,
Pointer pData,
- @Cast("spinPayloadTypeInfoIDs") int dataPayloadType,
+ @Cast("spinTLPayloadType") int dataPayloadType,
@Cast("size_t") long dataSize);
/**
@@ -8366,102 +8606,18 @@ public static native spinError spinImageCreateEx2(
public static native spinError spinImageDestroy(spinImage hImage);
/**
- * Sets the default color processing algorithm of all images (if not otherwise set)
- * @see spinError
- *
- * @param algorithm The color processing algorithm used by default
- *
- * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
- */
- public static native spinError spinImageSetDefaultColorProcessing(spinColorProcessingAlgorithm algorithm);
- public static native @Cast("spinError") int spinImageSetDefaultColorProcessing(@Cast("spinColorProcessingAlgorithm") int algorithm);
-
- /**
- * Retrieves the default color processing algorithm
- * @see spinError
- *
- * @param pAlgorithm The color processing algorithm enum pointer in which the color processing algorithm is returned
- *
- * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
- */
- public static native spinError spinImageGetDefaultColorProcessing(@Cast("spinColorProcessingAlgorithm*") IntPointer pAlgorithm);
- public static native @Cast("spinError") int spinImageGetDefaultColorProcessing(@Cast("spinColorProcessingAlgorithm*") IntBuffer pAlgorithm);
- public static native spinError spinImageGetDefaultColorProcessing(@Cast("spinColorProcessingAlgorithm*") int[] pAlgorithm);
-
- /**
- * Retrieves the color processing algorithm of a specific image
- * @see spinError
- *
- * @param hImage The image of the color processing algorithm to retrieve
- * @param pAlgorithm The color processing algorithm pointer in which the color processing algorithm is returned
- *
- * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
- */
+ * Retrieves the color processing algorithm of a specific image
+ * @see spinError
+ *
+ * @param hImage The image of the color processing algorithm to retrieve
+ * @param pAlgorithm The color processing algorithm pointer in which the color processing algorithm is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
public static native spinError spinImageGetColorProcessing(spinImage hImage, @Cast("spinColorProcessingAlgorithm*") IntPointer pAlgorithm);
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
- *
- * @param hSrcImage The image to be converted
- * @param pixelFormat The pixel format to be converted to
- * @param hDestImage The image handle pointer in which the converted image is returned
- *
- * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
- */
- public static native spinError spinImageConvert(spinImage hSrcImage, spinPixelFormatEnums pixelFormat, spinImage hDestImage);
- public static native @Cast("spinError") int spinImageConvert(spinImage hSrcImage, @Cast("spinPixelFormatEnums") int pixelFormat, spinImage hDestImage);
-
- /**
- * Converts the pixel format and color processing algorithm of one image into a new image
- * @see spinError
- *
- * @param hSrcImage The image to be converted
- * @param pixelFormat The pixel format to be converted to
- * @param algorithm The color processing algorithm to use for conversion
- * @param hDestImage The image handle pointer in which the converted image is returned
- *
- * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
- */
- public static native spinError spinImageConvertEx(
- spinImage hSrcImage,
- spinPixelFormatEnums pixelFormat,
- spinColorProcessingAlgorithm algorithm,
- spinImage hDestImage);
- public static native @Cast("spinError") int spinImageConvertEx(
- spinImage hSrcImage,
- @Cast("spinPixelFormatEnums") int pixelFormat,
- @Cast("spinColorProcessingAlgorithm") int algorithm,
- spinImage hDestImage);
/**
* Resets an image with some set properties
@@ -8531,9 +8687,9 @@ public static native spinError spinImageResetEx(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetID(spinImage hImage, @Cast("uint64_t*") IntPointer pId);
- public static native @Cast("spinError") int spinImageGetID(spinImage hImage, @Cast("uint64_t*") IntBuffer pId);
- public static native spinError spinImageGetID(spinImage hImage, @Cast("uint64_t*") int[] pId);
+ public static native spinError spinImageGetID(spinImage hImage, @Cast("uint64_t*") LongPointer pId);
+ public static native @Cast("spinError") int spinImageGetID(spinImage hImage, @Cast("uint64_t*") LongBuffer pId);
+ public static native spinError spinImageGetID(spinImage hImage, @Cast("uint64_t*") long[] pId);
/**
* Retrieves the image data of an image
@@ -8656,9 +8812,9 @@ public static native spinError spinImageResetEx(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") IntPointer pFrameID);
- public static native @Cast("spinError") int spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") IntBuffer pFrameID);
- public static native spinError spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") int[] pFrameID);
+ public static native spinError spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") LongPointer pFrameID);
+ public static native @Cast("spinError") int spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") LongBuffer pFrameID);
+ public static native spinError spinImageGetFrameID(spinImage hImage, @Cast("uint64_t*") long[] pFrameID);
/**
* Retrieves the timestamp of an image
@@ -8669,9 +8825,9 @@ public static native spinError spinImageResetEx(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") IntPointer pTimeStamp);
- public static native @Cast("spinError") int spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") IntBuffer pTimeStamp);
- public static native spinError spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") int[] pTimeStamp);
+ public static native spinError spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") LongPointer pTimeStamp);
+ public static native @Cast("spinError") int spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") LongBuffer pTimeStamp);
+ public static native spinError spinImageGetTimeStamp(spinImage hImage, @Cast("uint64_t*") long[] pTimeStamp);
/**
* Retrieves the payload type of an image (as an enum, spinPayloadTypeInfoIds)
@@ -8695,9 +8851,9 @@ public static native spinError spinImageResetEx(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetTLPayloadType(spinImage hImage, @Cast("spinPayloadTypeInfoIDs*") IntPointer pPayloadType);
- public static native @Cast("spinError") int spinImageGetTLPayloadType(spinImage hImage, @Cast("spinPayloadTypeInfoIDs*") IntBuffer pPayloadType);
- public static native spinError spinImageGetTLPayloadType(spinImage hImage, @Cast("spinPayloadTypeInfoIDs*") int[] pPayloadType);
+ public static native spinError spinImageGetTLPayloadType(spinImage hImage, @Cast("spinTLPayloadType*") IntPointer pPayloadType);
+ public static native @Cast("spinError") int spinImageGetTLPayloadType(spinImage hImage, @Cast("spinTLPayloadType*") IntBuffer pPayloadType);
+ public static native spinError spinImageGetTLPayloadType(spinImage hImage, @Cast("spinTLPayloadType*") int[] pPayloadType);
/**
* Retrieves the pixel format of an image (as an enum, spinPixelFormatEnums)
@@ -8722,9 +8878,9 @@ public static native spinError spinImageResetEx(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") IntPointer pPixelFormat);
- public static native @Cast("spinError") int spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") IntBuffer pPixelFormat);
- public static native spinError spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") int[] pPixelFormat);
+ public static native spinError spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") LongPointer pPixelFormat);
+ public static native @Cast("spinError") int spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") LongBuffer pPixelFormat);
+ public static native spinError spinImageGetTLPixelFormat(spinImage hImage, @Cast("uint64_t*") long[] pPixelFormat);
/**
* Retrieves the transport layer pixel format namespace of an image (as an enum, spinPixelFormatNamespaceID)
@@ -8738,13 +8894,13 @@ public static native spinError spinImageResetEx(
*/
public static native spinError spinImageGetTLPixelFormatNamespace(
spinImage hImage,
- @Cast("spinPixelFormatNamespaceID*") IntPointer pPixelFormatNamespace);
+ @Cast("spinTLPixelFormatNamespace*") IntPointer pPixelFormatNamespace);
public static native @Cast("spinError") int spinImageGetTLPixelFormatNamespace(
spinImage hImage,
- @Cast("spinPixelFormatNamespaceID*") IntBuffer pPixelFormatNamespace);
+ @Cast("spinTLPixelFormatNamespace*") IntBuffer pPixelFormatNamespace);
public static native spinError spinImageGetTLPixelFormatNamespace(
spinImage hImage,
- @Cast("spinPixelFormatNamespaceID*") int[] pPixelFormatNamespace);
+ @Cast("spinTLPixelFormatNamespace*") int[] pPixelFormatNamespace);
/**
* Retrieves the pixel format of an image (as a symbolic)
@@ -8912,9 +9068,9 @@ public static native spinError spinImageGetTLPixelFormatNamespace(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") IntPointer pId);
- public static native @Cast("spinError") int spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") IntBuffer pId);
- public static native spinError spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") int[] pId);
+ public static native spinError spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") LongPointer pId);
+ public static native @Cast("spinError") int spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") LongBuffer pId);
+ public static native spinError spinImageGetChunkLayoutID(spinImage hImage, @Cast("uint64_t*") long[] pId);
/**
* Calculates the image statistics of an image
@@ -9028,6 +9184,315 @@ public static native spinError spinImageGetTLPixelFormatNamespace(
public static native spinError spinImageGetStride(spinImage hImage, @Cast("size_t*") SizeTPointer pStride);
/*@}*/
+ /**
+ * \defgroup CImageProcessor Image Processor Access
+ *
+ * \brief The functions in this section provide access to information
+ * and functionality of image processor. This includes image processor creation,
+ * deletion, image conversion, image decompression and image post processing methods.
+ *
+ * All supported input image pixel formats can be converted to supported
+ * output image pixel formats. If the input pixel format is a compressed
+ * format, the decompression will occur before converting to the output
+ * pixel format.
+ *
+ * List of supported input image pixel formats:
+ *
+ *
+ * - PixelFormat_Mono8
+ *
- PixelFormat_Mono16
+ *
- PixelFormat_BayerGR8
+ *
- PixelFormat_BayerRG8
+ *
- PixelFormat_BayerGB8
+ *
- PixelFormat_BayerBG8
+ *
- PixelFormat_BayerGR16
+ *
- PixelFormat_BayerRG16
+ *
- PixelFormat_BayerGB16
+ *
- PixelFormat_BayerBG16
+ *
- PixelFormat_Mono12Packed
+ *
- PixelFormat_BayerGR12Packed
+ *
- PixelFormat_BayerRG12Packed
+ *
- PixelFormat_BayerGB12Packed
+ *
- PixelFormat_BayerBG12Packed
+ *
- PixelFormat_YUV411Packed
+ *
- PixelFormat_YUV422Packed
+ *
- PixelFormat_YUV444Packed
+ *
- PixelFormat_Mono12p
+ *
- PixelFormat_BayerGR12p
+ *
- PixelFormat_BayerRG12p
+ *
- PixelFormat_BayerGB12p
+ *
- PixelFormat_BayerBG12p
+ *
- PixelFormat_YCbCr8
+ *
- PixelFormat_YCbCr422_8
+ *
- PixelFormat_YCbCr411_8
+ *
- PixelFormat_BGR8
+ *
- PixelFormat_BGRa8
+ *
- PixelFormat_Mono10Packed
+ *
- PixelFormat_BayerGR10Packed
+ *
- PixelFormat_BayerRG10Packed
+ *
- PixelFormat_BayerGB10Packed
+ *
- PixelFormat_BayerBG10Packed
+ *
- PixelFormat_Mono10p
+ *
- PixelFormat_BayerGR10p
+ *
- PixelFormat_BayerRG10p
+ *
- PixelFormat_BayerGB10p
+ *
- PixelFormat_BayerBG10p
+ *
- PixelFormat_Mono10
+ *
- PixelFormat_Mono12
+ *
- PixelFormat_Mono14
+ *
- PixelFormat_BayerBG10
+ *
- PixelFormat_BayerBG12
+ *
- PixelFormat_BayerGB10
+ *
- PixelFormat_BayerGB12
+ *
- PixelFormat_BayerGR10
+ *
- PixelFormat_BayerGR12
+ *
- PixelFormat_BayerRG10
+ *
- PixelFormat_BayerRG12
+ *
- PixelFormat_RGBa8
+ *
- PixelFormat_RGB8
+ *
- PixelFormat_BGR16
+ *
- PixelFormat_R12
+ *
- PixelFormat_G12
+ *
- PixelFormat_B12
+ *
- PixelFormat_YUV8_UYV
+ *
- PixelFormat_YUV411_8_UYYVYY
+ *
- PixelFormat_YUV422_8
+ *
- PixelFormat_Polarized8
+ *
- PixelFormat_Polarized10p
+ *
- PixelFormat_Polarized12p
+ *
- PixelFormat_Polarized16
+ *
- PixelFormat_BayerRGPolarized8
+ *
- PixelFormat_BayerRGPolarized10p
+ *
- PixelFormat_BayerRGPolarized12p
+ *
- PixelFormat_BayerRGPolarized16
+ *
- PixelFormat_LLCMono8
+ *
- PixelFormat_LLCBayerRG8
+ *
- PixelFormat_JPEGMono8
+ *
- PixelFormat_JPEGColor8
+ *
- PixelFormat_Raw16
+ *
- PixelFormat_Raw8
+ *
- PixelFormat_R12_Jpeg
+ *
- PixelFormat_GR12_Jpeg
+ *
- PixelFormat_GB12_Jpeg
+ *
- PixelFormat_B12_Jpeg
+ *
+ *
+ * List of supported output image pixel formats
+ *
+ *
+ * - PixelFormat_Mono8
+ *
- PixelFormat_Mono16
+ *
- PixelFormat_BayerBG8
+ *
- PixelFormat_BayerGB8
+ *
- PixelFormat_BayerRG8
+ *
- PixelFormat_BayerGR8
+ *
- PixelFormat_BayerBG16
+ *
- PixelFormat_BayerGB16
+ *
- PixelFormat_BayerRG16
+ *
- PixelFormat_BayerGR16
+ *
- PixelFormat_BGR8
+ *
- PixelFormat_BGRa8
+ *
- PixelFormat_RGB8
+ *
- PixelFormat_RGBa8
+ *
- PixelFormat_BGR16
+ *
- PixelFormat_RGB16
+ *
- PixelFormat_R12
+ *
- PixelFormat_G12
+ *
- PixelFormat_B12
+ *
+ */
+ /*@{*/
+
+ /**
+ * Creates an image processor
+ * @see spinError
+ *
+ * @param phImageProcessor The image processor handle pointer in which the image processor context is returned
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageProcessorCreate(@ByPtrPtr spinImageProcessor phImageProcessor);
+
+ /**
+ * Destroys a image list
+ * @see spinError
+ *
+ * @param hImageProcessor The image processor context to destroy
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageProcessorDestroy(spinImageProcessor hImageProcessor);
+
+ /**
+ * Sets the color processing algorithm used at the time of the spinImageProcessorConvert()
+ * call, therefore the most recent execution of this function will take precedence. The
+ * DEFAULT algorithm is deprecated and should not be used in the ImageProcessor class.
+ *
+ * @param hImageProcessor The image processor context
+ * @param colorAlgorithm The color processing algorithm to set.
+ *
+ * @see spinImageProcessorGetColorProcessing()
+ */
+ public static native spinError spinImageProcessorSetColorProcessing(
+ spinImageProcessor hImageProcessor,
+ spinColorProcessingAlgorithm colorAlgorithm);
+ public static native @Cast("spinError") int spinImageProcessorSetColorProcessing(
+ spinImageProcessor hImageProcessor,
+ @Cast("spinColorProcessingAlgorithm") int colorAlgorithm);
+
+ /**
+ * Gets the default color processing algorithm.
+ *
+ * @param hImageProcessor The image processor context
+ * @param pColorAlgorithm The color processing algorithm pointer in which the color processing algorithm is returned
+ *
+ * @see spinImageProcessorSetColorProcessing()
+ */
+ public static native spinError spinImageProcessorGetColorProcessing(
+ spinImageProcessor hImageProcessor,
+ @Cast("spinColorProcessingAlgorithm*") IntPointer pColorAlgorithm);
+ public static native @Cast("spinError") int spinImageProcessorGetColorProcessing(
+ spinImageProcessor hImageProcessor,
+ @Cast("spinColorProcessingAlgorithm*") IntBuffer pColorAlgorithm);
+ public static native spinError spinImageProcessorGetColorProcessing(
+ spinImageProcessor hImageProcessor,
+ @Cast("spinColorProcessingAlgorithm*") int[] pColorAlgorithm);
+
+ /**
+ * Sets the default number of threads used for image decompression during
+ * spinImageProcessorConvert(). The number of threads used is defaulted to be equal
+ * to one less than the number of concurrent threads supported by the system.
+ *
+ * @param hImageProcessor The image processor context
+ * @param numThreads Number of parallel image decompression threads set to run
+ *
+ * @see spinImageProcessorConvert()
+ */
+ public static native spinError spinImageProcessorSetNumDecompressionThreads(
+ spinImageProcessor hImageProcessor,
+ @Cast("unsigned int") int numThreads);
+
+ /**
+ * Gets the number of threads used for image decompression during spinImageProcessorConvert().
+ *
+ * @param hImageProcessor The image processor context
+ * @param pNumThreads The unsigned integer pointer in which the number of parallel image decompression threads is
+ * returned
+ *
+ * @see spinImageProcessorSetNumDecompressionThreads()
+ */
+ public static native spinError spinImageProcessorGetNumDecompressionThreads(
+ spinImageProcessor hImageProcessor,
+ @Cast("unsigned int*") IntPointer pNumThreads);
+ public static native @Cast("spinError") int spinImageProcessorGetNumDecompressionThreads(
+ spinImageProcessor hImageProcessor,
+ @Cast("unsigned int*") IntBuffer pNumThreads);
+ public static native spinError spinImageProcessorGetNumDecompressionThreads(
+ spinImageProcessor hImageProcessor,
+ @Cast("unsigned int*") int[] pNumThreads);
+
+ /**
+ * Converts the source image buffer to the specified destination pixel format and
+ * stores the result in the destination image. The destination image needs to be
+ * configured to have the correct buffer size before calling this function. See
+ * spinImageReset() to setup the correct buffer size according to specified pixel format.
+ *
+ * Note that compressed images are decompressed before any further color processing
+ * or conversion during this call. Decompression is multi-threaded and defaults to
+ * utilizing one less than the number of concurrent threads supported by the
+ * system. The default number of decompression threads can be set with
+ * spinImageProcessorSetNumDecompressionThreads().
+ *
+ * @see spinPixelFormatEnums
+ * @see spinImageReset
+ * @see spinImageProcessorSetNumDecompressionThreads
+ *
+ * @param hImageProcessor The image processor context
+ * @param srcImage The source image from which to convert the image from.
+ * @param destImage The destination image in which the converted image data will be stored.
+ * @param destFormat Output format of the converted image.
+ */
+ public static native spinError spinImageProcessorConvert(
+ spinImageProcessor hImageProcessor,
+ spinImage hSrcImage,
+ spinImage hDestImage,
+ spinPixelFormatEnums destFormat);
+ public static native @Cast("spinError") int spinImageProcessorConvert(
+ spinImageProcessor hImageProcessor,
+ spinImage hSrcImage,
+ spinImage hDestImage,
+ @Cast("spinPixelFormatEnums") int destFormat);
+
+ /**
+ * Converts the source list of image buffers to the specified output pixel format
+ * and returns the result in a new image. The conversion could encompasses decompression,
+ * interleaving and conversion of image data depending on the source pixel format of
+ * images in the source image list. The destination image needs to be configured to
+ * have the correct buffer size before calling this function. See spinImageReset() to
+ * setup the correct buffer size according to specified pixel format.
+ *
+ * Note that compressed images are decompressed before any further color processing,
+ * interleaving or conversion is performed. Decompression is multi-threaded and
+ * defaults to utilizing one less than the number of concurrent threads supported by
+ * the system. The default number of decompression threads can be set with
+ * SetNumDecompressionThreads().
+ *
+ * Note not all the supported image pixel formats described in the class description
+ * are supported in this function.
+ *
+ * List of supported image pixel formats for the source image list:
+ *
+ *
+ * - PixelFormat_R12
+ *
- PixelFormat_GR12
+ *
- PixelFormat_GB12
+ *
- PixelFormat_B12
+ *
- PixelFormat_R12_Jpeg
+ *
- PixelFormat_GR12_Jpeg
+ *
- PixelFormat_GB12_Jpeg
+ *
- PixelFormat_B12_Jpeg
+ *
+ *
+ * @see spinPixelFormatEnums
+ * @see spinImageReset
+ * @see spinImageProcessorSetNumDecompressionThreads
+ *
+ * @param hImageProcessor The image processor context
+ * @param hSrcImageList List of images from which to convert the images from.
+ * @param hDestImage The destination image in which the converted image data will be stored.
+ * @param destFormat Output format of the converted image.
+ */
+ public static native spinError spinImageProcessorConvertImageList(
+ spinImageProcessor hImageProcessor,
+ spinImageList hSrcImageList,
+ spinImage hDestImage,
+ spinPixelFormatEnums destFormat);
+ public static native @Cast("spinError") int spinImageProcessorConvertImageList(
+ spinImageProcessor hImageProcessor,
+ spinImageList hSrcImageList,
+ spinImage hDestImage,
+ @Cast("spinPixelFormatEnums") int destFormat);
+
+ /**
+ * Applies gamma correction to the source image and stores the result in the destination image.
+ *
+ * @param hImageProcessor The image processor context
+ * @param hSrcImage The source image from which to apply gamma on.
+ * @param hDestImage The destination image in which the gamma applied image data will be stored.
+ * @param gamma Gamma value to apply. A value between 0.5 and 4 is acceptable. (Default assuming
+ * image-to-screen)
+ * @param applyGammaInverse Converts a gamma corrected source image back to the original image using the inverse
+ * of the gamma value (used for applying screen-to-image gamma)
+ */
+ public static native spinError spinImageProcessorApplyGamma(
+ spinImageProcessor hImageProcessor,
+ spinImage hSrcImage,
+ spinImage hDestImage,
+ float gamma,
+ @Cast("bool8_t") byte applyGammaInverse);
+
+ /*@}*/
+
/**
* \defgroup CEvent Event Access
*
@@ -9088,6 +9553,33 @@ public static native spinError spinImageEventHandlerCreate(
*/
public static native spinError spinImageEventHandlerDestroy(spinImageEventHandler hImageEventHandler);
+ /**
+ * Creates an image list event handler
+ * @see spinError
+ *
+ * @param phImageListEventHandler The image list event handler pointer in which the image list event context is
+ * created
+ * @param pFunction The function to be called at image list event occurrences; signature to match:
+ * void(*spinImageListEventFunction)(const spinListImage 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 spinImageListEventHandlerCreate(
+ @ByPtrPtr spinImageListEventHandler phImageEventHandler,
+ spinImageListEventFunction pFunction,
+ Pointer pUserData);
+
+ /**
+ * Destroys an image list event handler
+ * @see spinError
+ *
+ * @param hImageListEventHandler The image list event handler to destroy
+ *
+ * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
+ */
+ public static native spinError spinImageListEventHandlerDestroy(spinImageListEventHandler hImageListEventHandler);
+
/**
* Creates a device arrival event handler
* @see spinError
@@ -9744,9 +10236,9 @@ public static native spinError spinImageStatisticsGetAll(
*
* @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error
*/
- public static native spinError spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") IntPointer pEventId);
- public static native @Cast("spinError") int spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") IntBuffer pEventId);
- public static native spinError spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") int[] pEventId);
+ public static native spinError spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") LongPointer pEventId);
+ public static native @Cast("spinError") int spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") LongBuffer pEventId);
+ public static native spinError spinDeviceEventGetId(spinDeviceEventData hDeviceEventData, @Cast("uint64_t*") long[] pEventId);
/**
* Retrieves the payload data of a device event
@@ -9883,6 +10375,14 @@ public static native spinError spinDeviceEventGetPayloadData(
*/
// #include "SpinnakerDefsC.h"
+// #ifdef _MSC_VER
+// #pragma warning(push)
+// #pragma warning(disable : 4996)
+// #elif defined(__GNUC__)
+// #pragma GCC diagnostic push
+// #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+// #endif
+
/**
* \defgroup SpinnakerC Spinnaker C API
*/
@@ -9979,6 +10479,12 @@ public static native spinError spinDeviceEventGetPayloadData(
// #ifdef __cplusplus
// #endif
+// #ifdef _MSC_VER
+// #pragma warning(pop)
+// #elif defined(__GNUC__)
+// #pragma GCC diagnostic pop
+// #endif
+
/*@}*/
// #endif /* FLIR_SPIN_VIDEO_C_H */
@@ -9986,7 +10492,7 @@ public static native spinError spinDeviceEventGetPayloadData(
// Parsed from
//=============================================================================
-// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved.
+// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved.
//
// This software is the confidential and proprietary information of FLIR
// Integrated Imaging Solutions, Inc. ("Confidential Information"). You
@@ -10207,12 +10713,26 @@ public enum spinTLStreamTypeEnums {
@Override public String toString() { return intern().name(); }
}
+public enum spinTLStreamModeEnums {
+ /** Socket*/
+ StreamMode_Socket(0),
+ /** Light Weight Filter Driver*/
+ StreamMode_LWF(1),
+ /** Machine Vision Accelerator Driver*/
+ StreamMode_MVA(2),
+ NUMSTREAMMODE(3);
+
+ public final int value;
+ private spinTLStreamModeEnums(int v) { this.value = v; }
+ private spinTLStreamModeEnums(spinTLStreamModeEnums e) { this.value = e.value; }
+ public spinTLStreamModeEnums intern() { for (spinTLStreamModeEnums 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.*/
+ /** The number of buffers used for the stream is set by the user.*/
StreamBufferCountMode_Manual(0),
- /** DEPRECATED. The number of buffers used for the stream is automatically calculated based on the device frame rate.*/
- StreamBufferCountMode_Auto(1),
- NUMSTREAMBUFFERCOUNTMODE(2);
+ NUMSTREAMBUFFERCOUNTMODE(1);
public final int value;
private spinTLStreamBufferCountModeEnums(int v) { this.value = v; }
@@ -10285,19 +10805,17 @@ public enum spinTLDeviceAccessStatusEnums {
@Override public String toString() { return intern().name(); }
}
-public enum spinTLGevCCPEnums {
- /** Open access privilege.*/
- GevCCP_EnumEntry_GevCCP_OpenAccess(0),
- /** Exclusive access privilege.*/
- GevCCP_EnumEntry_GevCCP_ExclusiveAccess(1),
- /** Control access privilege.*/
- GevCCP_EnumEntry_GevCCP_ControlAccess(2),
- NUMGEVCCP(3);
+public enum spinTLGenICamXMLLocationEnums {
+ /** Load GenICam XML from device*/
+ GenICamXMLLocation_Device(0),
+ /** Load GenICam XML from host*/
+ GenICamXMLLocation_Host(1),
+ NUMGENICAMXMLLOCATION(2);
public final int value;
- private spinTLGevCCPEnums(int v) { this.value = v; }
- private spinTLGevCCPEnums(spinTLGevCCPEnums e) { this.value = e.value; }
- public spinTLGevCCPEnums intern() { for (spinTLGevCCPEnums e : values()) if (e.value == value) return e; return this; }
+ private spinTLGenICamXMLLocationEnums(int v) { this.value = v; }
+ private spinTLGenICamXMLLocationEnums(spinTLGenICamXMLLocationEnums e) { this.value = e.value; }
+ public spinTLGenICamXMLLocationEnums intern() { for (spinTLGenICamXMLLocationEnums e : values()) if (e.value == value) return e; return this; }
@Override public String toString() { return intern().name(); }
}
@@ -10315,17 +10833,19 @@ public enum spinTLGUIXMLLocationEnums {
@Override public String toString() { return intern().name(); }
}
-public enum spinTLGenICamXMLLocationEnums {
- /** Load GenICam XML from device*/
- GenICamXMLLocation_Device(0),
- /** Load GenICam XML from host*/
- GenICamXMLLocation_Host(1),
- NUMGENICAMXMLLOCATION(2);
+public enum spinTLGevCCPEnums {
+ /** Open access privilege.*/
+ GevCCP_EnumEntry_GevCCP_OpenAccess(0),
+ /** Exclusive access privilege.*/
+ GevCCP_EnumEntry_GevCCP_ExclusiveAccess(1),
+ /** Control access privilege.*/
+ GevCCP_EnumEntry_GevCCP_ControlAccess(2),
+ NUMGEVCCP(3);
public final int value;
- private spinTLGenICamXMLLocationEnums(int v) { this.value = v; }
- private spinTLGenICamXMLLocationEnums(spinTLGenICamXMLLocationEnums e) { this.value = e.value; }
- public spinTLGenICamXMLLocationEnums intern() { for (spinTLGenICamXMLLocationEnums e : values()) if (e.value == value) return e; return this; }
+ private spinTLGevCCPEnums(int v) { this.value = v; }
+ private spinTLGevCCPEnums(spinTLGevCCPEnums e) { this.value = e.value; }
+ public spinTLGevCCPEnums intern() { for (spinTLGevCCPEnums e : values()) if (e.value == value) return e; return this; }
@Override public String toString() { return intern().name(); }
}
@@ -10402,9 +10922,9 @@ public enum spinTLPOEStatusEnums {
}
public enum spinTLFilterDriverStatusEnums {
- /** Not Supported*/
+ /** Not Installed*/
FilterDriverStatus_NotSupported(0),
- /** FLIR Light Weight Filter Driver is disabled*/
+ /** FLIR Light Weight Filter Driver is disabled across all interfaces*/
FilterDriverStatus_Disabled(1),
/** FLIR Light Weight Filter Driver is enabled*/
FilterDriverStatus_Enabled(2),
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 e980d9c369a..d638fbaa99e 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.2).
+ * Wrapper for Point Grey Spinnaker_C library (the C API v.3).
*
* @author Jarek Sacha
*/
@@ -56,7 +56,7 @@
"",
"",
},
- link = {"SpinVideo_C@.2", "Spinnaker_C@.2"},
+ link = {"SpinVideo_C@.3", "Spinnaker_C@.3"},
linkpath = {"/opt/spinnaker/lib/",
"/usr/lib/"},
includepath = {"/opt/spinnaker/include/spinc/",
@@ -94,7 +94,10 @@ public void map(InfoMap infoMap) {
.put(new Info("SPINC_NO_DECLSPEC_STATEMENTS", "EXTERN_C").define())
// Skip to avoid linker errors, somehow Spinnaker SDK does not export those functions,
// To avoid errors like: jniSpinnaker_C.obj : error LNK2001: unresolved external symbol spinCameraForceIP
- .put(new Info("spinCameraForceIP", "spinRegisterSetEx", "spinSystemSendActionCommand", "spinInterfaceSendActionCommand").skip())
+ .put(new Info("spinCameraForceIP", "spinRegisterSetEx", "spinSystemSendActionCommand", "spinInterfaceSendActionCommand",
+ "SPINNAKER_TLPAYLOAD_TYPE_LOSSLESS_COMPRESSED",
+ "SPINNAKER_TLPAYLOAD_TYPE_LOSSY_COMPRESSED",
+ "SPINNAKER_TLPAYLOAD_TYPE_JPEG_LOSSLESS_COMPRESSED").skip())
;
}
}