diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml index 89c775350c9..a2f934bd938 100644 --- a/.github/actions/deploy-centos/action.yml +++ b/.github/actions/deploy-centos/action.yml @@ -122,14 +122,14 @@ runs: if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then echo Installing NVIDIA Video Codec SDK - python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x + python3 -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x unzip Video_Codec_SDK_12.1.14.zip -d /usr/local ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk fi if [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then echo Installing TensorRT - python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL + python3 -m gdown 1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL tar -hxvf TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz -C /usr/local/ ln -sf /usr/local/TensorRT* /usr/local/tensorrt fi @@ -142,22 +142,22 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture i386 - python3 -m gdown.cli https://drive.google.com/uc?id=1BOpSik1Fndagzjf4ykwzermt2qlTzsWI + python3 -m gdown 1BOpSik1Fndagzjf4ykwzermt2qlTzsWI tar -xzvf flycapture2-2.13.3.31-i386-pkg_xenial.tgz find -name *.deb | while read f; do ar -xv $f; tar --totals -xf data.tar.xz -C /; done; fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture amd64 - python3 -m gdown.cli https://drive.google.com/uc?id=1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd + python3 -m gdown 1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd tar -xzvf flycapture2-2.13.3.31-amd64-pkg_xenial.tgz find -name *.deb | while read f; do ar -xv $f; tar --totals -xf data.tar.xz -C /; done; fi 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=1B91OxuFgT-T29fNlBc2gsgr-K2l2LNtw - tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz + python3 -m gdown 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA + tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done; fi @@ -174,7 +174,7 @@ runs: GRADLE_TASK=publish MAVEN_PHASE=deploy if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then - python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS + python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS tar -xzf settings.tar.gz MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY" fi diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index b13e9948323..d4f02a17e53 100644 --- a/.github/actions/deploy-macosx/action.yml +++ b/.github/actions/deploy-macosx/action.yml @@ -85,7 +85,7 @@ runs: GRADLE_TASK=publish MAVEN_PHASE=deploy if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then - python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS + python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS tar -xzf settings.tar.gz MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY" fi diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index b5bf8f9351a..6988ab856e6 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -108,7 +108,7 @@ runs: # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776 $SUDO apt-get update $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH - $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev + $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget zstd unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV @@ -214,14 +214,14 @@ runs: if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then echo Installing NVIDIA Video Codec SDK - python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x + python3 -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x $SUDO unzip Video_Codec_SDK_12.1.14.zip -d /usr/local $SUDO ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then echo Installing TensorRT - # python3 -m gdown.cli https://drive.google.com/uc?id=1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU + # python3 -m gdown 1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Ubuntu-22.04.aarch64-gnu.cuda-12.4.tar.gz $SUDO tar -hxvf TensorRT-10.0.1.6.Ubuntu-22.04.aarch64-gnu.cuda-12.4.tar.gz -C /usr/local/ $SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt @@ -229,7 +229,7 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then echo Installing TensorRT - # python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL + # python3 -m gdown 1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz $SUDO tar -hxvf TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz -C /usr/local/ $SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt @@ -244,37 +244,37 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-armhf" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture amdhf - python3 -m gdown.cli https://drive.google.com/uc?id=16NuUBs2MXQpVYqzDCEr9KdMng-6rHuDI + python3 -m gdown 16NuUBs2MXQpVYqzDCEr9KdMng-6rHuDI mkdir -p $GITHUB_WORKSPACE/downloads ln -s $(pwd)/flycapture.2.13.3.31_armhf_xenial.tar.gz $GITHUB_WORKSPACE/downloads/flycapture.2.13.3.31_armhf.tar.gz fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture amd64 - python3 -m gdown.cli https://drive.google.com/uc?id=1LhnuRMT3urYsApCcuBEcaotGRK8h4kJv + python3 -m gdown 1LhnuRMT3urYsApCcuBEcaotGRK8h4kJv mkdir -p $GITHUB_WORKSPACE/downloads ln -s $(pwd)/flycapture.2.13.3.31_arm64_xenial.tar.gz $GITHUB_WORKSPACE/downloads/flycapture.2.13.3.31_arm64.tar.gz fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture i386 - python3 -m gdown.cli https://drive.google.com/uc?id=1BOpSik1Fndagzjf4ykwzermt2qlTzsWI + python3 -m gdown 1BOpSik1Fndagzjf4ykwzermt2qlTzsWI tar -xzvf flycapture2-2.13.3.31-i386-pkg_xenial.tgz find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xf data.tar.xz -C /; done; fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then echo Installing FlyCapture amd64 - python3 -m gdown.cli https://drive.google.com/uc?id=1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd + python3 -m gdown 1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd tar -xzvf flycapture2-2.13.3.31-amd64-pkg_xenial.tgz find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xf data.tar.xz -C /; done; fi 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=1B91OxuFgT-T29fNlBc2gsgr-K2l2LNtw - tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz - find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xvf data.tar.xz -C /; done; + python3 -m gdown 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA + tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz + find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals --use-compress-program=unzstd -xvf data.tar.zst -C /; done; fi GRADLE_TASK=publishToMavenLocal @@ -283,7 +283,7 @@ runs: GRADLE_TASK=publish MAVEN_PHASE=deploy if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then - python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS + python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS tar -xzf settings.tar.gz MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY" fi diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index 8fab07bd268..be08b50b7b6 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -101,7 +101,7 @@ runs: curl -LO https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_522.06_windows.exe curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_546.12_windows.exe rem curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.8.0/local_installers/12.0/cudnn_8.8.0.121_windows.exe - rem python -m gdown.cli https://drive.google.com/uc?id=135Z7zfwguQe6vn7p013HtVkHFu9-_rru + rem python -m gdown 135Z7zfwguQe6vn7p013HtVkHFu9-_rru curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/cudnn-windows-x86_64-8.9.7.29_cuda12-archive.zip curl -LO http://www.winimage.com/zLibDll/zlib123dllx64.zip curl -LO https://developer.download.nvidia.com/compute/nvcomp/3.0.5/local_installers/nvcomp_3.0.5_windows_12.x.zip @@ -142,14 +142,14 @@ runs: if "%CI_DEPLOY_MODULE%"=="nvcodec" ( echo Installing NVIDIA Video Codec SDK - python -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x + python -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x unzip Video_Codec_SDK_12.1.14.zip move Video_Codec_SDK_12.1.14 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK" ) if "%CI_DEPLOY_MODULE%"=="tensorrt" ( echo Installing TensorRT - rem python -m gdown.cli https://drive.google.com/uc?id=1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi + rem python -m gdown 1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/zip/TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip unzip TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip move TensorRT-10.0.1.6 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\TensorRT" @@ -163,34 +163,25 @@ runs: if "%CI_DEPLOY_PLATFORM%"=="windows-x86" if "%CI_DEPLOY_MODULE%"=="flycapture" ( echo Installing FlyCapture x86 - python -m gdown.cli https://drive.google.com/uc?id=1ctSSAMF5IkxTKWiiLtID-ltmm27pHFdr + python -m gdown 1ctSSAMF5IkxTKWiiLtID-ltmm27pHFdr rem We can get this msi file by starting the installation from the exe file cmd.exe /c "msiexec /quiet /i FlyCapture_2.13.3.31_x86.msi ADDLOCAL=ALL" ) if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if "%CI_DEPLOY_MODULE%"=="flycapture" ( echo Installing FlyCapture x64 - python -m gdown.cli https://drive.google.com/uc?id=14QM7W5RHhvZanF1UBobgEIvwdy6VwTht + python -m gdown 14QM7W5RHhvZanF1UBobgEIvwdy6VwTht rem We can get this msi file by starting the installation from the exe file cmd.exe /c "msiexec /quiet /i FlyCapture_2.13.3.31_x64.msi ADDLOCAL=ALL" ) - 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=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-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=12AkFMckbDqxFudYGWwaSLT7omOTtuRJt - python -m gdown.cli https://drive.google.com/uc?id=1_SUnBQnv4czISJWVFnbxxWRZM6d2yzZK + python -m gdown 1d0HHDHsPcgs-Pnw0u8KeeFlK79T1DQhf + python -m gdown 18cWXUhL6aFs57Q73aVWT1BF_--pzoMha rem We can get these msi files by starting the installation from the exe file - 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" + cmd.exe /c "msiexec /quiet /i Spinnaker_4.0.0.116_Binaries_v140_x64.msi ADDLOCAL=ALL" + cmd.exe /c "msiexec /quiet /i Spinnaker_4.0.0.116_SourceCode_v140_x64.msi ADDLOCAL=ALL" ) set GRADLE_TASK=publishToMavenLocal @@ -202,7 +193,7 @@ runs: set GRADLE_TASK=publish set MAVEN_PHASE=deploy if "%DEPLOY%"=="RELEASE" ( - python -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=%CI_DEPLOY_SETTINGS% + python -m gdown -q -O settings.tar.gz %CI_DEPLOY_SETTINGS% bash -c "tar -xzf settings.tar.gz -C $HOME" set "MAVEN_OPTIONS=%MAVEN_OPTIONS% -DperformRelease -DstagingRepositoryId=%STAGING_REPOSITORY%" ) diff --git a/.github/workflows/spinnaker.yml b/.github/workflows/spinnaker.yml index 7de8319ed25..1b9366dcebd 100644 --- a/.github/workflows/spinnaker.yml +++ b/.github/workflows/spinnaker.yml @@ -19,19 +19,14 @@ env: jobs: linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/CHANGELOG.md b/CHANGELOG.md index 163dd929aea..caae38c8183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481)) * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472)) * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475)) - * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies + * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies ### January 29, 2024 version 1.5.10 * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463)) diff --git a/README.md b/README.md index 9a5a5621c98..af6279be583 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * OpenCV 4.10.x https://opencv.org/releases/ * FFmpeg 7.0.x http://ffmpeg.org/download.html * FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk - * Spinnaker 3.0.x https://www.flir.com/products/spinnaker-sdk + * Spinnaker 4.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 2c7ab157694..af56f867fbc 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-3.0.0.118-amd64-pkg.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then + if [[ $(find $HOME/downloads/spinnaker-4.0.0.116-amd64-pkg-22.04.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 1ILDEZk0SuOoh4_cJExpZJCPXCqfxUkAi $HOME/downloads/spinnaker-3.0.0.118-amd64-pkg.tar.gz + python $TRAVIS_BUILD_DIR/ci/gDownload.py 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA $HOME/downloads/spinnaker-4.0.0.116-amd64-pkg.tar.gz fi - 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 + tar xzvf $HOME/downloads/spinnaker-spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz -C $TRAVIS_BUILD_DIR/../ + ls $TRAVIS_BUILD_DIR/../spinnaker-4.0.0.116-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done; + ln -s libSpinnaker_C.so.4.0.0.116 usr/lib/libSpinnaker_C.so.1 + ln -s libSpinnaker.so.4.0.0.116 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 f735872a493..de5b849d614 100755 --- a/ci/install-windows.sh +++ b/ci/install-windows.sh @@ -80,27 +80,16 @@ fi if [[ "$PROJ" =~ spinnaker ]]; then echo Spinnaker install if [ "$OS" == "windows-x86_64" ]; then - if [[ $(find /c/Downloads/Spinnaker_3.0.0.118_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then + if [[ $(find /c/Downloads/Spinnaker_4.0.0.116_*_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 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 + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1d0HHDHsPcgs-Pnw0u8KeeFlK79T1DQhf /c/Downloads/Spinnaker_4.0.0.116_Binaries_v140_x64.msi + /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 18cWXUhL6aFs57Q73aVWT1BF_--pzoMha /c/Downloads/Spinnaker_4.0.0.116_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_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_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 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_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' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_4.0.0.116_Binaries_v140_x64.msi ADDLOCAL=ALL' + cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_4.0.0.116_SourceCode_v140_x64.msi ADDLOCAL=ALL' fi echo "Finished spinnaker install" fi diff --git a/platform/pom.xml b/platform/pom.xml index cd6cf9e40ff..9cd3265a2a4 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -18,7 +18,7 @@ ../opencv/platform ../ffmpeg/platform - + ../spinnaker/platform @@ -99,11 +99,11 @@ - - - - - + + org.bytedeco + spinnaker-platform + 4.0.0.116-${project.version} + diff --git a/spinnaker/README.md b/spinnaker/README.md index 64857a03065..42774063106 100644 --- a/spinnaker/README.md +++ b/spinnaker/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Spinnaker 3.0.0.118 https://www.flir.com/products/spinnaker-sdk + * Spinnaker 4.0.0.116 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.9 + 1.5.11-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 - 3.0.0.118-1.5.9 + 4.0.0.116-1.5.11-SNAPSHOT diff --git a/spinnaker/cppbuild.sh b/spinnaker/cppbuild.sh index bc85c25571e..7746e38b11c 100755 --- a/spinnaker/cppbuild.sh +++ b/spinnaker/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -SPINNAKER_VERSION=3.0.0.118 +SPINNAKER_VERSION=4.0.0.116 case $PLATFORM in linux-arm*) @@ -29,9 +29,10 @@ case $PLATFORM in fi ;; windows-*) - if [[ ! -d "/C/Program Files/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/Spinnaker/" ]] && - [[ ! -d "/C/Program Files/FLIR Systems/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/FLIR Systems/Spinnaker/" ]]; then + if [[ ! -d "/C/Program Files/Teledyne/Spinnaker/" ]] && [[ ! -d "/C/Program Files/Spinnaker/" ]]; then echo "Please install Spinnaker under the default installation directory" + echo "Content of C:/Program Files" + ls -l "/C/Program Files" exit 1 fi ;; diff --git a/spinnaker/platform/pom.xml b/spinnaker/platform/pom.xml index 3b9bc677891..6e664f9b006 100644 --- a/spinnaker/platform/pom.xml +++ b/spinnaker/platform/pom.xml @@ -6,13 +6,13 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.11-SNAPSHOT ../../ org.bytedeco spinnaker-platform - 3.0.0.118-${project.parent.version} + 4.0.0.116-${project.parent.version} JavaCPP Presets Platform for Spinnaker diff --git a/spinnaker/pom.xml b/spinnaker/pom.xml index c9118f3d946..eee90024645 100644 --- a/spinnaker/pom.xml +++ b/spinnaker/pom.xml @@ -6,12 +6,12 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.11-SNAPSHOT org.bytedeco spinnaker - 3.0.0.118-${project.parent.version} + 4.0.0.116-${project.parent.version} JavaCPP Presets for Spinnaker diff --git a/spinnaker/samples/pom.xml b/spinnaker/samples/pom.xml index e5f85b29d38..550d0ef1fc1 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.9 + 1.5.11-SNAPSHOT Acquisition_C 1.7 @@ -12,7 +12,7 @@ org.bytedeco spinnaker-platform - 3.0.0.118-1.5.9 + 4.0.0.116-1.5.11-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 7a791938e33..0d571f0674f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 b8f95d2a8db..aa64a4ae95e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 c24fae1b112..0d73f89798e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -15,7 +15,7 @@ * \defgroup TLDeviceC_h TLDevice Structures * \ingroup CQuickSpin */ -/*@{*/ +/**\{*/ @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) public class quickSpinTLDevice extends Pointer { 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 28c3966bfa7..257b236687d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -15,7 +15,7 @@ * \defgroup TLInterfaceC_h TLInterface Structures * \ingroup CQuickSpin */ -/*@{*/ +/**\{*/ @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) public class quickSpinTLInterface extends Pointer { @@ -47,12 +47,15 @@ public class quickSpinTLInterface extends Pointer { public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceTransmitLinkSpeed(); public native quickSpinTLInterface GevInterfaceTransmitLinkSpeed(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceReceiveLinkSpeed(); public native quickSpinTLInterface GevInterfaceReceiveLinkSpeed(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceMTU(); public native quickSpinTLInterface GevInterfaceMTU(spinNodeHandle setter); + public native @Cast("quickSpinBooleanNode") spinNodeHandle GevInterfaceIsIPConflict(); public native quickSpinTLInterface GevInterfaceIsIPConflict(spinNodeHandle setter); public native @Cast("quickSpinEnumerationNode") spinNodeHandle POEStatus(); public native quickSpinTLInterface POEStatus(spinNodeHandle setter); - public native @Cast("quickSpinEnumerationNode") spinNodeHandle FilterDriverStatus(); public native quickSpinTLInterface FilterDriverStatus(spinNodeHandle setter); + public native @Cast("quickSpinEnumerationNode") spinNodeHandle FLIRFilterDriverStatus(); public native quickSpinTLInterface FLIRFilterDriverStatus(spinNodeHandle setter); + public native @Cast("quickSpinEnumerationNode") spinNodeHandle TeledyneGigeVisionFilterDriverStatus(); public native quickSpinTLInterface TeledyneGigeVisionFilterDriverStatus(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionDeviceKey(); public native quickSpinTLInterface GevActionDeviceKey(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionGroupKey(); public native quickSpinTLInterface GevActionGroupKey(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionGroupMask(); public native quickSpinTLInterface GevActionGroupMask(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionTime(); public native quickSpinTLInterface GevActionTime(spinNodeHandle setter); + public native @Cast("quickSpinBooleanNode") spinNodeHandle GevActionAckRequired(); public native quickSpinTLInterface GevActionAckRequired(spinNodeHandle setter); public native @Cast("quickSpinCommandNode") spinNodeHandle ActionCommand(); public native quickSpinTLInterface ActionCommand(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle DeviceUnlock(); public native quickSpinTLInterface DeviceUnlock(spinNodeHandle setter); public native @Cast("quickSpinCommandNode") spinNodeHandle DeviceUpdateList(); public native quickSpinTLInterface DeviceUpdateList(spinNodeHandle setter); @@ -80,6 +83,9 @@ public class quickSpinTLInterface extends Pointer { public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceSubnetMask(); public native quickSpinTLInterface GevDeviceForceSubnetMask(spinNodeHandle setter); public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceGateway(); public native quickSpinTLInterface GevDeviceForceGateway(spinNodeHandle setter); public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceAutoForceIP(); public native quickSpinTLInterface GevDeviceAutoForceIP(spinNodeHandle setter); + public native @Cast("quickSpinBooleanNode") spinNodeHandle GevDeviceDiscoveryEnabled(); public native quickSpinTLInterface GevDeviceDiscoveryEnabled(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceEnableDiscovery(); public native quickSpinTLInterface GevDeviceEnableDiscovery(spinNodeHandle setter); + public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceDisableDiscovery(); public native quickSpinTLInterface GevDeviceDisableDiscovery(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterName(); public native quickSpinTLInterface HostAdapterName(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterVendor(); public native quickSpinTLInterface HostAdapterVendor(spinNodeHandle setter); public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterDriverVersion(); public native quickSpinTLInterface HostAdapterDriverVersion(spinNodeHandle setter); diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLStream.java index 665dbb68258..551639b97d8 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -15,7 +15,7 @@ * \defgroup TLStreamC_h TLStream Structures * \ingroup CQuickSpin */ -/*@{*/ +/**\{*/ @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) public class quickSpinTLStream extends Pointer { @@ -63,8 +63,20 @@ public class quickSpinTLStream extends Pointer { 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 StreamPacketResendRequestTimeoutCount(); public native quickSpinTLStream StreamPacketResendRequestTimeoutCount(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 StreamPacketsDuplicatedCount(); public native quickSpinTLStream StreamPacketsDuplicatedCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketsTimeoutCount(); public native quickSpinTLStream StreamPacketsTimeoutCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketsNotYetAvailableCount(); public native quickSpinTLStream StreamPacketsNotYetAvailableCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketsTemporarilyUnavailableCount(); public native quickSpinTLStream StreamPacketsTemporarilyUnavailableCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketsPerFrameCount(); public native quickSpinTLStream StreamPacketsPerFrameCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamPacketsUnavailableCount(); public native quickSpinTLStream StreamPacketsUnavailableCount(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksReceptionTimeLast(); public native quickSpinTLStream StreamBlocksReceptionTimeLast(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksReceptionTimeMin(); public native quickSpinTLStream StreamBlocksReceptionTimeMin(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksReceptionTimeMax(); public native quickSpinTLStream StreamBlocksReceptionTimeMax(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksProcessingTimeLast(); public native quickSpinTLStream StreamBlocksProcessingTimeLast(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksProcessingTimeMin(); public native quickSpinTLStream StreamBlocksProcessingTimeMin(spinNodeHandle setter); + public native @Cast("quickSpinIntegerNode") spinNodeHandle StreamBlocksProcessingTimeMax(); public native quickSpinTLStream StreamBlocksProcessingTimeMax(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 f346c8e8806..01ec237a24a 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -15,7 +15,7 @@ * \defgroup TLSystemC_h TLSystem Structures * \ingroup CQuickSpin */ -/*@{*/ +/**\{*/ @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class) public class quickSpinTLSystem extends Pointer { @@ -61,4 +61,5 @@ public class quickSpinTLSystem extends Pointer { 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); + public native @Cast("quickSpinBooleanNode") spinNodeHandle GevAutoAssignIPEnable(); public native quickSpinTLSystem GevAutoAssignIPEnable(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 1546d9d51fa..6229c34b0c5 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 684ce687351..5860c5e436c 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinBMPOption.java index de375fcbccc..dc1d522ebef 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 65baf78ad8d..b1acfbca3d5 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 948d6c85f34..91a59c56fe7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 8a9bfe0678a..8558bd2b4f4 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; @@ -17,12 +17,12 @@ * * Definitions for Spinnaker C */ -/*@{*/ +/**\{*/ /** * \defgroup ChunkDataDefC_h Chunk Data Structures */ -/*@{*/ +/**\{*/ /** * \brief The type of information that can be obtained from image chunk data. 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 b62f5340efb..8dfc7bd10a1 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 08136150daf..f3631e5dd3f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 c617b7e20ed..b687962518f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 bd6b107de8c..4e205f7074b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 ddaf1571552..a52d03e5892 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 661505b8903..6c1891cfbf6 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 e11205c9765..fb92cf20d2b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 6872e973a01..dd49c382ef5 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 57e5419d35e..4885c1c96b0 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 index 5e9673ce7d9..944a16e0751 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageList.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 index 3fc62de67c6..97050862905 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventFunction.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 index 9a2eb1290f1..fa1a1005d80 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventHandler.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageListEventHandler.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 index b5ada44c68d..82e6381445a 100644 --- a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageProcessor.java +++ b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinImageProcessor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 395fc61c1b4..ce810a8d2a2 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 981ff9db7a1..bc8cff2090b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 06358f65212..516061c23f6 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 ec13b630cc0..bc515af6dc7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 a2ae0dac2b2..89c8fe8bac7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 8d4f0533757..7222b5ab4f2 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 9820e92ac82..f252956e9ac 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 cd5620a303a..acfb0dfaf2e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 904665aa523..fe35fc45289 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 175b2398f73..0594bbb9596 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 5aab1b51dbf..f65036c5a85 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 2e394ea9cb6..3ad69dc722e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 cbccf394d4e..8a52263a351 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 732fe88c542..87f13e41a0a 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 4620390bac4..4c07485bd52 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 f842f9390f4..af12170d178 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 52baa406b0b..3627c618a21 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 33cdae74fd3..aaf9789cc22 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 53d91728339..e7db45d4ccf 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; diff --git a/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java b/spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/spinSystem.java index 9c4736f3f68..1c3def22581 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 d425ad5ac04..512c696a0f6 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.Spinnaker_C; 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 874ab50df4a..cddb681b06e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-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 466bdd55854..cccdb624f77 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.spinnaker.global; @@ -169,79 +169,79 @@ public class Spinnaker_C extends org.bytedeco.spinnaker.presets.Spinnaker_C { public static final byte False = False(); @MemberGetter public static native @Cast("const bool8_t") byte True(); public static final byte True = True(); -// Targeting ../Spinnaker_C/spinSystem.java +// Targeting ..\Spinnaker_C\spinSystem.java -// Targeting ../Spinnaker_C/spinInterfaceList.java +// Targeting ..\Spinnaker_C\spinInterfaceList.java -// Targeting ../Spinnaker_C/spinInterface.java +// Targeting ..\Spinnaker_C\spinInterface.java -// Targeting ../Spinnaker_C/spinCameraList.java +// Targeting ..\Spinnaker_C\spinCameraList.java -// Targeting ../Spinnaker_C/spinCamera.java +// Targeting ..\Spinnaker_C\spinCamera.java -// Targeting ../Spinnaker_C/spinImage.java +// Targeting ..\Spinnaker_C\spinImage.java -// Targeting ../Spinnaker_C/spinImageList.java +// Targeting ..\Spinnaker_C\spinImageList.java -// Targeting ../Spinnaker_C/spinImageProcessor.java +// Targeting ..\Spinnaker_C\spinImageProcessor.java -// Targeting ../Spinnaker_C/spinImageStatistics.java +// Targeting ..\Spinnaker_C\spinImageStatistics.java -// Targeting ../Spinnaker_C/spinDeviceEventHandler.java +// Targeting ..\Spinnaker_C\spinDeviceEventHandler.java -// Targeting ../Spinnaker_C/spinImageEventHandler.java +// Targeting ..\Spinnaker_C\spinImageEventHandler.java -// Targeting ../Spinnaker_C/spinImageListEventHandler.java +// Targeting ..\Spinnaker_C\spinImageListEventHandler.java -// Targeting ../Spinnaker_C/spinDeviceArrivalEventHandler.java +// Targeting ..\Spinnaker_C\spinDeviceArrivalEventHandler.java -// Targeting ../Spinnaker_C/spinDeviceRemovalEventHandler.java +// Targeting ..\Spinnaker_C\spinDeviceRemovalEventHandler.java -// Targeting ../Spinnaker_C/spinInterfaceEventHandler.java +// Targeting ..\Spinnaker_C\spinInterfaceEventHandler.java -// Targeting ../Spinnaker_C/spinLogEventHandler.java +// Targeting ..\Spinnaker_C\spinLogEventHandler.java -// Targeting ../Spinnaker_C/spinLogEventData.java +// Targeting ..\Spinnaker_C\spinLogEventData.java -// Targeting ../Spinnaker_C/spinDeviceEventData.java +// Targeting ..\Spinnaker_C\spinDeviceEventData.java -// Targeting ../Spinnaker_C/spinVideo.java +// Targeting ..\Spinnaker_C\spinVideo.java -// Targeting ../Spinnaker_C/spinDeviceEventFunction.java +// Targeting ..\Spinnaker_C\spinDeviceEventFunction.java -// Targeting ../Spinnaker_C/spinImageEventFunction.java +// Targeting ..\Spinnaker_C\spinImageEventFunction.java -// Targeting ../Spinnaker_C/spinImageListEventFunction.java +// Targeting ..\Spinnaker_C\spinImageListEventFunction.java -// Targeting ../Spinnaker_C/spinArrivalEventFunction.java +// Targeting ..\Spinnaker_C\spinArrivalEventFunction.java -// Targeting ../Spinnaker_C/spinRemovalEventFunction.java +// Targeting ..\Spinnaker_C\spinRemovalEventFunction.java -// Targeting ../Spinnaker_C/spinLogEventFunction.java +// Targeting ..\Spinnaker_C\spinLogEventFunction.java @@ -502,13 +502,13 @@ public enum spinnakerLogLevel { 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). + // 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. + // 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. + // 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. @@ -574,8 +574,8 @@ public enum spinTIFFCompressionMethod { } /** -* Possible Status Codes Returned from Action Command. -*/ + * Possible Status Codes Returned from Action Command. + */ public enum spinActionCommandStatus { /** The device acknowledged the command. */ SPINNAKER_ACTION_COMMAND_STATUS_OK(0), @@ -601,40 +601,40 @@ public enum spinActionCommandStatus { 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\spinPNGOption.java -// Targeting ../Spinnaker_C/spinPPMOption.java +// Targeting ..\Spinnaker_C\spinPPMOption.java -// Targeting ../Spinnaker_C/spinPGMOption.java +// Targeting ..\Spinnaker_C\spinPGMOption.java -// Targeting ../Spinnaker_C/spinTIFFOption.java +// Targeting ..\Spinnaker_C\spinTIFFOption.java -// Targeting ../Spinnaker_C/spinJPEGOption.java +// Targeting ..\Spinnaker_C\spinJPEGOption.java -// Targeting ../Spinnaker_C/spinJPG2Option.java +// Targeting ..\Spinnaker_C\spinJPG2Option.java -// Targeting ../Spinnaker_C/spinBMPOption.java +// Targeting ..\Spinnaker_C\spinBMPOption.java -// Targeting ../Spinnaker_C/spinMJPGOption.java +// Targeting ..\Spinnaker_C\spinMJPGOption.java -// Targeting ../Spinnaker_C/spinH264Option.java +// Targeting ..\Spinnaker_C\spinH264Option.java -// Targeting ../Spinnaker_C/spinAVIOption.java +// Targeting ..\Spinnaker_C\spinAVIOption.java -// Targeting ../Spinnaker_C/spinLibraryVersion.java +// Targeting ..\Spinnaker_C\spinLibraryVersion.java -// Targeting ../Spinnaker_C/actionCommandResult.java +// Targeting ..\Spinnaker_C\actionCommandResult.java @@ -647,7 +647,7 @@ public enum spinActionCommandStatus { // Parsed from //============================================================================= -// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -674,12 +674,12 @@ public enum spinActionCommandStatus { * * Definitions for Spinnaker C */ -/*@{*/ +/**\{*/ /** * \defgroup CameraDefsC_h Camera Enumerations */ -/*@{*/ +/**\{*/ /** *\brief The enum definitions for camera nodes. @@ -5548,16 +5548,16 @@ public enum spinCxpPoCxpStatusEnums { @Override public String toString() { return intern().name(); } } -/*@}*/ +/**\}*/ -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKER_CAMERA_DEFS_C_H // Parsed from //============================================================================= -// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -5579,13 +5579,13 @@ public enum spinCxpPoCxpStatusEnums { // #define FLIR_SPINNAKER_CHUNKDATADEF_C_H // #include "SpinnakerPlatformC.h" -// Targeting ../Spinnaker_C/spinChunkData.java +// Targeting ..\Spinnaker_C\spinChunkData.java -/*@}*/ +/**\}*/ -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKER_CHUNKDATADEF_C_H @@ -5610,16 +5610,16 @@ public enum spinCxpPoCxpStatusEnums { // #ifndef FLIR_SPINNAKER_GENAPIDEFS_C_H // #define FLIR_SPINNAKER_GENAPIDEFS_C_H -// Targeting ../Spinnaker_C/spinNodeMapHandle.java +// Targeting ..\Spinnaker_C\spinNodeMapHandle.java -// Targeting ../Spinnaker_C/spinNodeHandle.java +// Targeting ..\Spinnaker_C\spinNodeHandle.java -// Targeting ../Spinnaker_C/spinNodeCallbackHandle.java +// Targeting ..\Spinnaker_C\spinNodeCallbackHandle.java -// Targeting ../Spinnaker_C/spinNodeCallbackFunction.java +// Targeting ..\Spinnaker_C\spinNodeCallbackFunction.java @@ -7544,6 +7544,7 @@ public static native spinError spinSystemUnregisterInterfaceEventHandler( * @param iGroupKey The Action Command's group key * @param iGroupMask The Action Command's group mask * @param iActionTime (Optional) Time when to assert a future action. Zero means immediate action. + * @param requestAck (Optional) Whether to request an ACK from the camera. True is to send ack. * @param piResultSize (Optional) The number of results in the results array. The value passed should be equal to * the expected number of devices that acknowledge the command. Returns the number of received results. * @param results (Optional) An Array with *piResultSize elements to hold the action command result status. The @@ -8091,6 +8092,7 @@ public static native spinError spinInterfaceUnregisterInterfaceEventHandler( * @param iGroupKey The Action Command's group key * @param iGroupMask The Action Command's group mask * @param iActionTime (Optional) Time when to assert a future action. Zero means immediate action. + * @param requestAck (Optional) Whether to request an ACK from the camera. True is to send ack. * @param piResultSize (Optional) The number of results in the results array. The value passed should be equal to * the expected number of devices that acknowledge the command. Returns the number of received results. * @param results (Optional) An Array with *piResultSize elements to hold the action command result status. The @@ -8276,6 +8278,21 @@ public static native spinError spinInterfaceUnregisterInterfaceEventHandler( */ public static native spinError spinCameraGetNextImageSync(spinCamera hCamera, @Cast("uint64_t") long grabTimeout, @ByPtrPtr spinImageList phImageList); + /** + * Retrieves a unique identifier for a camera + * @see spinError + * + * @param hCamera The camera of the unique identifier + * @param pBuf The c-string character buffer in which the unique identifier is returned + * @param pBufLen The unsigned integer pointer in which the length of the c-string is returned; the input value is + * the maximum length + * + * @return spinError The error code; returns SPINNAKER_ERR_SUCCESS (or 0) for no error + */ + public static native spinError spinCameraGetDeviceID(spinCamera hCamera, @Cast("char*") BytePointer pBuf, @Cast("size_t*") SizeTPointer pBufLen); + public static native @Cast("spinError") int spinCameraGetDeviceID(spinCamera hCamera, @Cast("char*") ByteBuffer pBuf, @Cast("size_t*") SizeTPointer pBufLen); + public static native spinError spinCameraGetDeviceID(spinCamera hCamera, @Cast("char*") byte[] pBuf, @Cast("size_t*") SizeTPointer pBufLen); + /** * Retrieves a unique identifier for a camera * @see spinError @@ -8606,19 +8623,18 @@ public static native spinError spinImageCreateEx2( public static native spinError spinImageDestroy(spinImage hImage); /** - * 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); - /** * Resets an image with some set properties * @see spinError @@ -10492,7 +10508,7 @@ public static native spinError spinDeviceEventGetPayloadData( // Parsed from //============================================================================= -// Copyright (c) 2001-2022 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10514,7 +10530,7 @@ public static native spinError spinDeviceEventGetPayloadData( // #define FLIR_SPINNAKER_QUICKSPINDEFS_C_H // #include "SpinnakerGenApiDefsC.h" -// Targeting ../Spinnaker_C/quickSpin.java +// Targeting ..\Spinnaker_C\quickSpin.java @@ -10656,7 +10672,7 @@ public static native spinError quickSpinInitEx( // Parsed from //============================================================================= -// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10680,12 +10696,12 @@ public static native spinError quickSpinInitEx( /** * \defgroup CQuickSpin Spinnaker C QuickSpin API */ -/*@{*/ +/**\{*/ /** * \defgroup TransportLayerDefsC_h Transport Layer Enumerations */ -/*@{*/ +/**\{*/ /** *\brief The enumeration definitions for transport layer nodes. @@ -10718,8 +10734,8 @@ public enum spinTLStreamModeEnums { StreamMode_Socket(0), /** Light Weight Filter Driver*/ StreamMode_LWF(1), - /** Machine Vision Accelerator Driver*/ - StreamMode_MVA(2), + /** Teledyne Gige Vision Driver*/ + StreamMode_TeledyneGigeVision(2), NUMSTREAMMODE(3); public final int value; @@ -10921,19 +10937,35 @@ public enum spinTLPOEStatusEnums { @Override public String toString() { return intern().name(); } } -public enum spinTLFilterDriverStatusEnums { +public enum spinTLFLIRFilterDriverStatusEnums { /** Not Installed*/ - FilterDriverStatus_NotSupported(0), + FLIRFilterDriverStatus_NotSupported(0), /** FLIR Light Weight Filter Driver is disabled across all interfaces*/ - FilterDriverStatus_Disabled(1), + FLIRFilterDriverStatus_Disabled(1), /** FLIR Light Weight Filter Driver is enabled*/ - FilterDriverStatus_Enabled(2), - NUMFILTERDRIVERSTATUS(3); + FLIRFilterDriverStatus_Enabled(2), + NUMFLIRFILTERDRIVERSTATUS(3); + + public final int value; + private spinTLFLIRFilterDriverStatusEnums(int v) { this.value = v; } + private spinTLFLIRFilterDriverStatusEnums(spinTLFLIRFilterDriverStatusEnums e) { this.value = e.value; } + public spinTLFLIRFilterDriverStatusEnums intern() { for (spinTLFLIRFilterDriverStatusEnums e : values()) if (e.value == value) return e; return this; } + @Override public String toString() { return intern().name(); } +} + +public enum spinTLTeledyneGigeVisionFilterDriverStatusEnums { + /** Not Installed*/ + TeledyneGigeVisionFilterDriverStatus_NotSupported(0), + /** Teledyne Gige Vision Filter Driver is disabled across all interfaces*/ + TeledyneGigeVisionFilterDriverStatus_Disabled(1), + /** Teledyne Gige Vision Filter Driver is enabled*/ + TeledyneGigeVisionFilterDriverStatus_Enabled(2), + NUMTELEDYNEGIGEVISIONFILTERDRIVERSTATUS(3); public final int value; - private spinTLFilterDriverStatusEnums(int v) { this.value = v; } - private spinTLFilterDriverStatusEnums(spinTLFilterDriverStatusEnums e) { this.value = e.value; } - public spinTLFilterDriverStatusEnums intern() { for (spinTLFilterDriverStatusEnums e : values()) if (e.value == value) return e; return this; } + private spinTLTeledyneGigeVisionFilterDriverStatusEnums(int v) { this.value = v; } + private spinTLTeledyneGigeVisionFilterDriverStatusEnums(spinTLTeledyneGigeVisionFilterDriverStatusEnums e) { this.value = e.value; } + public spinTLTeledyneGigeVisionFilterDriverStatusEnums intern() { for (spinTLTeledyneGigeVisionFilterDriverStatusEnums e : values()) if (e.value == value) return e; return this; } @Override public String toString() { return intern().name(); } } @@ -10961,16 +10993,16 @@ public enum spinTLTLTypeEnums { @Override public String toString() { return intern().name(); } } -/*@}*/ +/**\}*/ -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKER_TRANSPORTLAYERDEFSC_H // Parsed from //============================================================================= -// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -10992,18 +11024,18 @@ public enum spinTLTLTypeEnums { // #ifndef FLIR_SPINNAKERC_TLDEVICE_H // #define FLIR_SPINNAKERC_TLDEVICE_H -// Targeting ../Spinnaker_C/quickSpinTLDevice.java +// Targeting ..\Spinnaker_C\quickSpinTLDevice.java -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKERC_TLDEVICE_H // Parsed from //============================================================================= -// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -11025,18 +11057,18 @@ public enum spinTLTLTypeEnums { // #ifndef FLIR_SPINNAKERC_TLINTERFACE_H // #define FLIR_SPINNAKERC_TLINTERFACE_H -// Targeting ../Spinnaker_C/quickSpinTLInterface.java +// Targeting ..\Spinnaker_C\quickSpinTLInterface.java -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKERC_TLINTERFACE_H // Parsed from //============================================================================= -// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -11058,18 +11090,18 @@ public enum spinTLTLTypeEnums { // #ifndef FLIR_SPINNAKERC_TLSTREAM_H // #define FLIR_SPINNAKERC_TLSTREAM_H -// Targeting ../Spinnaker_C/quickSpinTLStream.java +// Targeting ..\Spinnaker_C\quickSpinTLStream.java -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKERC_TLSTREAM_H // Parsed from //============================================================================= -// Copyright (c) 2001-2021 FLIR Systems, Inc. All Rights Reserved. +// Copyright (c) 2001-2023 FLIR Systems, Inc. All Rights Reserved. // // This software is the confidential and proprietary information of FLIR // Integrated Imaging Solutions, Inc. ("Confidential Information"). You @@ -11091,11 +11123,11 @@ public enum spinTLTLTypeEnums { // #ifndef FLIR_SPINNAKERC_TLSYSTEM_H // #define FLIR_SPINNAKERC_TLSYSTEM_H -// Targeting ../Spinnaker_C/quickSpinTLSystem.java +// Targeting ..\Spinnaker_C\quickSpinTLSystem.java -/*@}*/ +/**\}*/ // #endif // FLIR_SPINNAKERC_TLSYSTEM_H diff --git a/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java b/spinnaker/src/main/java/org/bytedeco/spinnaker/presets/Spinnaker_C.java index d638fbaa99e..dbeb93f90ef 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 @@ -56,35 +56,22 @@ "", "", }, - link = {"SpinVideo_C@.3", "Spinnaker_C@.3"}, + link = {"SpinVideo_C@.4", "Spinnaker_C@.4"}, linkpath = {"/opt/spinnaker/lib/", "/usr/lib/"}, includepath = {"/opt/spinnaker/include/spinc/", "/usr/include/spinnaker/spinc/"}), @Platform(value = "windows", link = {"SpinnakerC_v140", "Spinnaker_v140", "SpinVideoC_v140", "SpinVideo_v140"}, - includepath = {"C:/Program Files/FLIR Systems/Spinnaker/include/spinc/", - "C:/Program Files (x86)/FLIR Systems/Spinnaker/include/spinc/", - // CI installation skips "FLIR Systems" dir - "C:/Program Files/Spinnaker/include/spinc/", - "C:/Program Files (x86)/Spinnaker/include/spinc"}), - @Platform(value = "windows-x86", - linkpath = {"C:/Program Files/FLIR Systems/Spinnaker/lib/vs2015/", - "C:/Program Files (x86)/FLIR Systems/Spinnaker/lib/vs2015/", - // CI installation skips "FLIR Systems" dir - "C:/Program Files/Spinnaker/lib/vs2015", - "C:/Program Files (x86)/Spinnaker/lib/vs2015"}, - preloadpath = {"C:/Program Files/FLIR Systems/Spinnaker/bin/vs2015/", - "C:/Program Files (x86)/FLIR Systems/Spinnaker/bin/vs2015/", - // CI installation skips "FLIR Systems" dir - "C:/Program Files/Spinnaker/bin/vs2015/", - "C:/Program Files (x86)/Spinnaker/bin/vs2015/",}), + includepath = {"C:/Program Files/Teledyne/Spinnaker/include/spinc/", + // CI installation skips "Teledyne" dir + "C:/Program Files/Spinnaker/include/spinc/"}), @Platform(value = "windows-x86_64", - linkpath = {"C:/Program Files/FLIR Systems/Spinnaker/lib64/vs2015/", - // CI automatic installation skips "LIR Systems" dir? + linkpath = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/", + // CI installation skips "Teledyne" dir "C:/Program Files/Spinnaker/lib64/vs2015/"}, - preloadpath = {"C:/Program Files/FLIR Systems/Spinnaker/bin64/vs2015/", - // CI automatic installation skips "LIR Systems" dir? - "C:/Program Files/Spinnaker/bin64/vs2015/"})}) + preloadpath = {"C:/Program Files/Teledyne/Spinnaker/lib64/vs2015/", + // CI installation skips "Teledyne" dir + "C:/Program Files/Spinnaker/lib64/vs2015/"})}) public class Spinnaker_C implements InfoMapper { static { Loader.checkVersion("org.bytedeco", "spinnaker"); }