From 8915c21880d3f9f8b904c6a871b0b08910c18712 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 09:48:48 -0400 Subject: [PATCH] Bump acquire-common from `a446cf9` to `4444f5c` (#123) Bumps [acquire-common](https://github.com/acquire-project/acquire-common) from `a446cf9` to `4444f5c`.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Liddell --- acquire-common | 2 +- tests/blackfly-one-video-stream.cpp | 3 ++- tests/oryx-one-video-stream.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/acquire-common b/acquire-common index a446cf9..4444f5c 160000 --- a/acquire-common +++ b/acquire-common @@ -1 +1 @@ -Subproject commit a446cf9c7bdfdaccb93a5bff6b3aa5ce0a0f319c +Subproject commit 4444f5c95f699e22b47e9a6e321359016faa03e6 diff --git a/tests/blackfly-one-video-stream.cpp b/tests/blackfly-one-video-stream.cpp index f7d8df9..aac0094 100644 --- a/tests/blackfly-one-video-stream.cpp +++ b/tests/blackfly-one-video-stream.cpp @@ -72,7 +72,8 @@ main() SIZED("out.tif"), 0, 0, - { .x = 1, .y = 1 }); + { .x = 1, .y = 1 }, + 0); props.video[0].camera.settings.binning = 1; props.video[0].camera.settings.pixel_type = SampleType_u8; diff --git a/tests/oryx-one-video-stream.cpp b/tests/oryx-one-video-stream.cpp index 3faa84e..99638b3 100644 --- a/tests/oryx-one-video-stream.cpp +++ b/tests/oryx-one-video-stream.cpp @@ -72,7 +72,8 @@ main() SIZED("out.tif"), 0, 0, - { .x = 1, .y = 1 }); + { .x = 1, .y = 1 }, + 0); props.video[0].camera.settings.binning = 1; props.video[0].camera.settings.pixel_type = SampleType_u8;