[libcamera-devel,v3,1/2] src: android: Rectify internal header's #include path
diff mbox series

Message ID 20210430043957.111667-2-umang.jain@ideasonboard.com
State Accepted
Commit 08f74696173c1047f9d8e414021e8cd96a1ab646
Headers show
Series
  • Rectify inclusion of internal headers
Related show

Commit Message

Umang Jain April 30, 2021, 4:39 a.m. UTC
libcamera internal headers are not installed system-wide. Hence, any
inclusion of internal headers should be follow the #include directive
form:
	#include "libcamera/internal/header.h"

This was not the case for a few of the class in android HAL. Fix them.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
---
 src/android/camera_stream.h              | 2 +-
 src/android/mm/generic_camera_buffer.cpp | 2 +-
 src/android/post_processor.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Paul Elder April 30, 2021, 6:25 a.m. UTC | #1
Hi Umang,

On Fri, Apr 30, 2021 at 10:09:56AM +0530, Umang Jain wrote:
> libcamera internal headers are not installed system-wide. Hence, any
> inclusion of internal headers should be follow the #include directive
> form:
> 	#include "libcamera/internal/header.h"
> 
> This was not the case for a few of the class in android HAL. Fix them.
> 
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Hirokazu Honda <hiroh@chromium.org>

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  src/android/camera_stream.h              | 2 +-
>  src/android/mm/generic_camera_buffer.cpp | 2 +-
>  src/android/post_processor.h             | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
> index f68fdd3a..34016722 100644
> --- a/src/android/camera_stream.h
> +++ b/src/android/camera_stream.h
> @@ -19,7 +19,7 @@
>  #include <libcamera/geometry.h>
>  #include <libcamera/pixel_format.h>
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  
>  class CameraDevice;
>  class CameraMetadata;
> diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
> index 929e078a..334498c1 100644
> --- a/src/android/mm/generic_camera_buffer.cpp
> +++ b/src/android/mm/generic_camera_buffer.cpp
> @@ -7,7 +7,7 @@
>  
>  #include "../camera_buffer.h"
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  #include "libcamera/internal/log.h"
>  
>  using namespace libcamera;
> diff --git a/src/android/post_processor.h b/src/android/post_processor.h
> index 4944078b..547fda37 100644
> --- a/src/android/post_processor.h
> +++ b/src/android/post_processor.h
> @@ -10,7 +10,7 @@
>  #include <libcamera/buffer.h>
>  #include <libcamera/stream.h>
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  
>  #include "camera_buffer.h"
>  
> -- 
> 2.29.2
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series

diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index f68fdd3a..34016722 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -19,7 +19,7 @@ 
 #include <libcamera/geometry.h>
 #include <libcamera/pixel_format.h>
 
-#include <libcamera/internal/buffer.h>
+#include "libcamera/internal/buffer.h"
 
 class CameraDevice;
 class CameraMetadata;
diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
index 929e078a..334498c1 100644
--- a/src/android/mm/generic_camera_buffer.cpp
+++ b/src/android/mm/generic_camera_buffer.cpp
@@ -7,7 +7,7 @@ 
 
 #include "../camera_buffer.h"
 
-#include <libcamera/internal/buffer.h>
+#include "libcamera/internal/buffer.h"
 #include "libcamera/internal/log.h"
 
 using namespace libcamera;
diff --git a/src/android/post_processor.h b/src/android/post_processor.h
index 4944078b..547fda37 100644
--- a/src/android/post_processor.h
+++ b/src/android/post_processor.h
@@ -10,7 +10,7 @@ 
 #include <libcamera/buffer.h>
 #include <libcamera/stream.h>
 
-#include <libcamera/internal/buffer.h>
+#include "libcamera/internal/buffer.h"
 
 #include "camera_buffer.h"