Remove Pragma for unused variable in VDO header files

GHakansson · johan-hultberg-work · commit cc8eefa165cf · 2024-11-19T10:53:31.000+01:00
diff --git a/.github/workflows/object-detection-cv25.yml b/.github/workflows/object-detection-cv25.yml
@@ -15,7 +15,7 @@ jobs:
         include:
           - arch: aarch64
             chip: cv25
-            axis-os: 12.0.91
+            axis-os: 12.1.60
     env:
       EXREPO: acap-native-examples
       EXNAME: object-detection-cv25
diff --git a/.github/workflows/object-detection.yml b/.github/workflows/object-detection.yml
@@ -15,13 +15,13 @@ jobs:
         include:
           - arch: armv7hf
             chip: cpu
-            axis-os: 12.0.91
+            axis-os: 12.1.60
           - arch: armv7hf
             chip: edgetpu
-            axis-os: 12.0.91
+            axis-os: 12.1.60
           - arch: aarch64
             chip: artpec8
-            axis-os: 12.0.91
+            axis-os: 12.1.60
     env:
       EXREPO: acap-native-examples
       EXNAME: object-detection
diff --git a/.github/workflows/using-opencv.yml b/.github/workflows/using-opencv.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        axis-os: ["12.0.91"]
+        axis-os: ["12.1.60"]
         arch: ["armv7hf", "aarch64"]
     env:
       EXREPO: acap-native-examples
diff --git a/.github/workflows/vdo-larod.yml b/.github/workflows/vdo-larod.yml
@@ -15,16 +15,16 @@ jobs:
         include:
           - arch: armv7hf
             chip: cpu
-            axis-os: 12.0.91
+            axis-os: 12.1.60
           - arch: armv7hf
             chip: edgetpu
-            axis-os: 12.0.91
+            axis-os: 12.1.60
           - arch: aarch64
             chip: artpec8
-            axis-os: 12.0.91
+            axis-os: 12.1.60
           - arch: aarch64
             chip: cv25
-            axis-os: 12.0.91
+            axis-os: 12.1.60
     env:
       EXREPO: acap-native-examples
       EXNAME: vdo-larod
diff --git a/.github/workflows/vdo-opencl-filtering.yml b/.github/workflows/vdo-opencl-filtering.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        axis-os: ["12.0.91"]
+        axis-os: ["12.1.60"]
         arch: ["armv7hf", "aarch64"]
     env:
       EXREPO: acap-native-examples
diff --git a/.github/workflows/vdostream.yml b/.github/workflows/vdostream.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        axis-os: ["12.0.91"]
+        axis-os: ["12.1.60"]
         arch: ["armv7hf", "aarch64"]
         vdo-format: ["h264", "h265", "y800", "jpeg", "nv12"]
     env:
diff --git a/object-detection-cv25/Dockerfile b/object-detection-cv25/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=aarch64
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 ARG UBUNTU_VERSION=24.04
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
diff --git a/object-detection-cv25/app/imgprovider.c b/object-detection-cv25/app/imgprovider.c
@@ -25,11 +25,8 @@
 #include <gmodule.h>
 #include <syslog.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-map.h"
 #include <vdo-channel.h>
-#pragma GCC diagnostic pop
 
 #define VDO_CHANNEL (1)
 
diff --git a/object-detection-cv25/app/imgprovider.h b/object-detection-cv25/app/imgprovider.h
@@ -24,11 +24,8 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #define NUM_VDO_BUFFERS (8)
 
diff --git a/object-detection-cv25/app/object_detection.c b/object-detection-cv25/app/object_detection.c
@@ -66,11 +66,8 @@
 #include "imgutils.h"
 #include "larod.h"
 #include "postprocessing.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-frame.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 /**
  * @brief Free up resources held by an array of labels.
diff --git a/object-detection/Dockerfile b/object-detection/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=armv7hf
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 ARG UBUNTU_VERSION=24.04
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
diff --git a/object-detection/app/imgprovider.c b/object-detection/app/imgprovider.c
@@ -25,11 +25,8 @@
 #include <gmodule.h>
 #include <syslog.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-map.h"
 #include <vdo-channel.h>
-#pragma GCC diagnostic pop
 
 #define VDO_CHANNEL (1)
 
diff --git a/object-detection/app/imgprovider.h b/object-detection/app/imgprovider.h
@@ -24,11 +24,8 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #define NUM_VDO_BUFFERS (8)
 
diff --git a/object-detection/app/object_detection.c b/object-detection/app/object_detection.c
@@ -59,10 +59,7 @@
 #include "imgutils.h"
 #include "larod.h"
 #include "vdo-frame.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 /**
  * @brief Free up resources held by an array of labels.
diff --git a/using-opencv/Dockerfile b/using-opencv/Dockerfile
@@ -2,7 +2,7 @@ ARG ARCH=armv7hf
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
 ARG UBUNTU_VERSION=24.04
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 
 FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION}
 
diff --git a/using-opencv/app/imgprovider.cpp b/using-opencv/app/imgprovider.cpp
@@ -25,11 +25,8 @@
 #include <gmodule.h>
 #include <syslog.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-map.h"
 #include <vdo-channel.h>
-#pragma GCC diagnostic pop
 
 #define VDO_CHANNEL (1)
 
diff --git a/using-opencv/app/imgprovider.h b/using-opencv/app/imgprovider.h
@@ -26,11 +26,8 @@
 
 #include <stdbool.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #define NUM_VDO_BUFFERS (8)
 
diff --git a/vdo-larod/Dockerfile b/vdo-larod/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=armv7hf
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 ARG UBUNTU_VERSION=24.04
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
diff --git a/vdo-larod/app/imgprovider.c b/vdo-larod/app/imgprovider.c
@@ -24,11 +24,9 @@
 #include <errno.h>
 #include <gmodule.h>
 #include <syslog.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
+
 #include "vdo-map.h"
 #include <vdo-channel.h>
-#pragma GCC diagnostic pop
 
 #define VDO_CHANNEL (1)
 
diff --git a/vdo-larod/app/imgprovider.h b/vdo-larod/app/imgprovider.h
@@ -24,11 +24,8 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #define NUM_VDO_BUFFERS (8)
 
diff --git a/vdo-opencl-filtering/Dockerfile b/vdo-opencl-filtering/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=armv7hf
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 ARG UBUNTU_VERSION=24.04
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
diff --git a/vdo-opencl-filtering/app/vdo_cl_filter_demo.c b/vdo-opencl-filtering/app/vdo_cl_filter_demo.c
@@ -46,13 +46,10 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-error.h"
 #include "vdo-map.h"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #define CL_TARGET_OPENCL_VERSION 120
 #include <CL/cl.h>
diff --git a/vdostream/Dockerfile b/vdostream/Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=armv7hf
-ARG VERSION=12.0.0
+ARG VERSION=12.1.0-rc.1
 ARG UBUNTU_VERSION=24.04
 ARG REPO=axisecp
 ARG SDK=acap-native-sdk
diff --git a/vdostream/app/vdoencodeclient.c b/vdostream/app/vdoencodeclient.c
@@ -48,13 +48,10 @@
  *         -o vdo.out
  */
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "vdo-error.h"
 #include "vdo-map.h"
 #include "vdo-stream.h"
 #include "vdo-types.h"
-#pragma GCC diagnostic pop
 
 #include <glib.h>
 #include <glib/gstdio.h>
