[libcamera-devel] libcamera: ipa_manager: Fix build path comments

Message ID 20200429151910.2341468-1-kieran.bingham@ideasonboard.com
State Accepted
Commit 389c19c267cb20312a0fd895c2418da73c91283d
Headers show
Series
  • [libcamera-devel] libcamera: ipa_manager: Fix build path comments
Related show

Commit Message

Kieran Bingham April 29, 2020, 3:19 p.m. UTC
The comments describe functionality before libcameraBuildPath() was
adapted from libcameraPath() to return the root of the build, and
described having to take a relative path.

This is no longer the case, and the comment is inaccurate. Fix it.

Fixes: 1b8ac8473c94 ("libcamera: utils: Adapt libcameraPath to match use cases")
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/libcamera/ipa_manager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Laurent Pinchart April 29, 2020, 3:38 p.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Wed, Apr 29, 2020 at 04:19:10PM +0100, Kieran Bingham wrote:
> The comments describe functionality before libcameraBuildPath() was
> adapted from libcameraPath() to return the root of the build, and
> described having to take a relative path.
> 
> This is no longer the case, and the comment is inaccurate. Fix it.
> 
> Fixes: 1b8ac8473c94 ("libcamera: utils: Adapt libcameraPath to match use cases")
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

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

> ---
>  src/libcamera/ipa_manager.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
> index df3786797010..1faa3dd38188 100644
> --- a/src/libcamera/ipa_manager.cpp
> +++ b/src/libcamera/ipa_manager.cpp
> @@ -114,10 +114,7 @@ IPAManager::IPAManager()
>  
>  	/*
>  	 * When libcamera is used before it is installed, load IPAs from the
> -	 * same build directory as the libcamera library itself. This requires
> -	 * identifying the path of the libcamera.so, and referencing a relative
> -	 * path for the IPA from that point. We need to recurse one level of
> -	 * sub-directories to match the build tree.
> +	 * same build directory as the libcamera library itself.
>  	 */
>  	std::string root = utils::libcameraBuildPath();
>  	if (!root.empty()) {
Niklas Söderlund April 30, 2020, 12:59 a.m. UTC | #2
Hi Kieran,

Thanks for your work.

On 2020-04-29 16:19:10 +0100, Kieran Bingham wrote:
> The comments describe functionality before libcameraBuildPath() was
> adapted from libcameraPath() to return the root of the build, and
> described having to take a relative path.
> 
> This is no longer the case, and the comment is inaccurate. Fix it.
> 
> Fixes: 1b8ac8473c94 ("libcamera: utils: Adapt libcameraPath to match use cases")
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/ipa_manager.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
> index df3786797010..1faa3dd38188 100644
> --- a/src/libcamera/ipa_manager.cpp
> +++ b/src/libcamera/ipa_manager.cpp
> @@ -114,10 +114,7 @@ IPAManager::IPAManager()
>  
>  	/*
>  	 * When libcamera is used before it is installed, load IPAs from the
> -	 * same build directory as the libcamera library itself. This requires
> -	 * identifying the path of the libcamera.so, and referencing a relative
> -	 * path for the IPA from that point. We need to recurse one level of
> -	 * sub-directories to match the build tree.
> +	 * same build directory as the libcamera library itself.
>  	 */
>  	std::string root = utils::libcameraBuildPath();
>  	if (!root.empty()) {
> -- 
> 2.25.1
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
index df3786797010..1faa3dd38188 100644
--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
@@ -114,10 +114,7 @@  IPAManager::IPAManager()
 
 	/*
 	 * When libcamera is used before it is installed, load IPAs from the
-	 * same build directory as the libcamera library itself. This requires
-	 * identifying the path of the libcamera.so, and referencing a relative
-	 * path for the IPA from that point. We need to recurse one level of
-	 * sub-directories to match the build tree.
+	 * same build directory as the libcamera library itself.
 	 */
 	std::string root = utils::libcameraBuildPath();
 	if (!root.empty()) {