Spinnaker 3.0.0.118 upgrade

.github/actions/deploy-centos/action.yml

@@ -24,7 +24,7 @@ runs:
         if [[ "$CENTOS_VERSION" == "6" ]]; then
           sed -i 's/mirror\.centos\.org\/centos/vault.centos.org/g;s/6\/sclo/6.10\/sclo/g;s/mirrorlist/#mirrorlist/g;s/#baseurl/baseurl/g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
         fi
-        yum -y install $SCL_ENABLE rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel
+        yum -y install $SCL_ENABLE rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel zstd
         # https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html
         sed -i 's/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/g' /opt/rh/devtoolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9/include/avx512fintrin.h
         source scl_source enable $SCL_ENABLE || true
@@ -145,9 +145,9 @@ runs:
 
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then
           echo Installing Spinnaker amd64
-          python3 -m gdown.cli https://drive.google.com/uc?id=1zr9k4x-NI3OkVMLCccSBY4VtR-16iAQG
-          tar -xzvf spinnaker-2.4.0.143-Ubuntu18.04-amd64-pkg.tar.gz
-          find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done;
+          python3 -m gdown.cli https://drive.google.com/uc?id=1ILDEZk0SuOoh4_cJExpZJCPXCqfxUkAi
+          tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz
+          find -name *.deb | while read f; do ar -xv $f; tar -I zstd --totals -xvf data.tar.zst -C /; done;
         fi
 
         if [[ -n ${CI_DEPLOY_NEED_GCC:-} ]]; then

.github/actions/deploy-windows/action.yml

@@ -147,20 +147,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

.github/workflows/spinnaker.yml

@@ -21,15 +21,15 @@ jobs:
     runs-on: ubuntu-20.04
     container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: ihmcrobotics/javacpp-presets/.github/actions/deploy-centos@spinnaker-upgrade
   windows-x86:
     runs-on: windows-2019
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+      - uses: ihmcrobotics/javacpp-presets/.github/actions/deploy-windows@spinnaker-upgrade
   windows-x86_64:
     runs-on: windows-2019
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+      - uses: ihmcrobotics/javacpp-presets/.github/actions/deploy-windows@spinnaker-upgrade
   redeploy:
     needs: [linux-x86_64, windows-x86, windows-x86_64]
     runs-on: ubuntu-20.04

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

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

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

platform/pom.xml

@@ -101,7 +101,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>spinnaker-platform</artifactId>
-      <version>2.4.0.143-${project.version}</version>
+      <version>3.0.0.118-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

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,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.spinnaker</groupId>
     <artifactId>acquisition_c</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Acquisition_C</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>spinnaker-platform</artifactId>
-            <version>2.4.0.143-1.5.8</version>
+            <version>3.0.0.118-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -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");
                 }

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*)

spinnaker/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>spinnaker-platform</artifactId>
-  <version>2.4.0.143-${project.parent.version}</version>
+  <version>3.0.0.118-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Spinnaker</name>
 
   <properties>

spinnaker/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>spinnaker</artifactId>
-  <version>2.4.0.143-${project.parent.version}</version>
+  <version>3.0.0.118-${project.parent.version}</version>
   <name>JavaCPP Presets for Spinnaker</name>
 
   <dependencies>

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");
                 }

spinnaker/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.spinnaker</groupId>
     <artifactId>acquisition_c</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Acquisition_C</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>spinnaker-platform</artifactId>
-            <version>2.4.0.143-1.5.8</version>
+            <version>3.0.0.118-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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);
 }

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;