libcamera: pipeline: Fix LIBCAMERA_<NAME>_TUNING_FILE handling
diff mbox series

Message ID 20250221135836.450451-1-stefan.klug@ideasonboard.com
State Accepted
Headers show
Series
  • libcamera: pipeline: Fix LIBCAMERA_<NAME>_TUNING_FILE handling
Related show

Commit Message

Stefan Klug Feb. 21, 2025, 1:57 p.m. UTC
In f5da05ed03ee ("libcamera: pipeline: Move tuning file override
handling to IPAProxy") a incorrect comparison slipped through. That
broke the handling of LIBCAMERA_<NAME>_TUNING_FILE. Fix that.

Fixes: f5da05ed03ee ("libcamera: pipeline: Move tuning file override handling to IPAProxy")
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
---

This was merged 4 weeks ago. Unbelievable we didn't notice earlier :-/

Best regards,
Stefan

---
 src/libcamera/ipa_proxy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart Feb. 21, 2025, 2:07 p.m. UTC | #1
Hi Stefan,

Thank you for the patch.

On Fri, Feb 21, 2025 at 02:57:02PM +0100, Stefan Klug wrote:
> In f5da05ed03ee ("libcamera: pipeline: Move tuning file override
> handling to IPAProxy") a incorrect comparison slipped through. That
> broke the handling of LIBCAMERA_<NAME>_TUNING_FILE. Fix that.
> 
> Fixes: f5da05ed03ee ("libcamera: pipeline: Move tuning file override handling to IPAProxy")
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> This was merged 4 weeks ago. Unbelievable we didn't notice earlier :-/

... Mea culpa. Maybe this needs a test in CI ?

> ---
>  src/libcamera/ipa_proxy.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
> index 25f772a41bf8..9907b9615ec7 100644
> --- a/src/libcamera/ipa_proxy.cpp
> +++ b/src/libcamera/ipa_proxy.cpp
> @@ -115,7 +115,7 @@ std::string IPAProxy::configurationFile(const std::string &name,
>  	ipaEnvName = "LIBCAMERA_" + ipaEnvName + "_TUNING_FILE";
>  
>  	char const *configFromEnv = utils::secure_getenv(ipaEnvName.c_str());
> -	if (configFromEnv && *configFromEnv == '\0')
> +	if (configFromEnv && *configFromEnv != '\0')
>  		return { configFromEnv };
>  
>  	struct stat statbuf;

Patch
diff mbox series

diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
index 25f772a41bf8..9907b9615ec7 100644
--- a/src/libcamera/ipa_proxy.cpp
+++ b/src/libcamera/ipa_proxy.cpp
@@ -115,7 +115,7 @@  std::string IPAProxy::configurationFile(const std::string &name,
 	ipaEnvName = "LIBCAMERA_" + ipaEnvName + "_TUNING_FILE";
 
 	char const *configFromEnv = utils::secure_getenv(ipaEnvName.c_str());
-	if (configFromEnv && *configFromEnv == '\0')
+	if (configFromEnv && *configFromEnv != '\0')
 		return { configFromEnv };
 
 	struct stat statbuf;