[libcamera-devel,05/31] libcamera: ipa: Make <ipa/ipa_controls.h> self-contained

Message ID 20200229164254.23604-6-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • libcamera: Add support for array controls
Related show

Commit Message

Laurent Pinchart Feb. 29, 2020, 4:42 p.m. UTC
The <ipa/ipa_controls.h> header makes use of uint*_t types, but doesn't
include stdint.h. Fix it, and include ipa_controls.h in ipa_controls.cpp
to test compilation of the header on its own.

While at it, fix the comment as the top of ipa_controls.cpp to refer to
the correct file name.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/ipa/ipa_controls.h     | 2 ++
 src/libcamera/ipa_controls.cpp | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Kieran Bingham March 2, 2020, 10:12 p.m. UTC | #1
Aha an easy one at last...

On 29/02/2020 16:42, Laurent Pinchart wrote:
> The <ipa/ipa_controls.h> header makes use of uint*_t types, but doesn't
> include stdint.h. Fix it, and include ipa_controls.h in ipa_controls.cpp
> to test compilation of the header on its own.
> 
> While at it, fix the comment as the top of ipa_controls.cpp to refer to
> the correct file name.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/ipa/ipa_controls.h     | 2 ++
>  src/libcamera/ipa_controls.cpp | 4 +++-
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/include/ipa/ipa_controls.h b/include/ipa/ipa_controls.h
> index 426d99689de2..6371e34575f2 100644
> --- a/include/ipa/ipa_controls.h
> +++ b/include/ipa/ipa_controls.h
> @@ -7,6 +7,8 @@
>  #ifndef __LIBCAMERA_IPA_CONTROLS_H__
>  #define __LIBCAMERA_IPA_CONTROLS_H__
>  
> +#include <stdint.h>
> +
>  #ifdef __cplusplus
>  extern "C" {
>  #endif
> diff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp
> index 6ea71bc6dc46..dd3ff9a0d467 100644
> --- a/src/libcamera/ipa_controls.cpp
> +++ b/src/libcamera/ipa_controls.cpp
> @@ -2,9 +2,11 @@
>  /*
>   * Copyright (C) 2019, Google Inc.
>   *
> - * ipa_controls.h - IPA control handling
> + * ipa_controls.cpp - IPA control handling
>   */
>  
> +#include <ipa/ipa_controls.h>
> +
>  /**
>   * \file ipa_controls.h
>   * \brief Type definitions for serialized controls
>

Patch

diff --git a/include/ipa/ipa_controls.h b/include/ipa/ipa_controls.h
index 426d99689de2..6371e34575f2 100644
--- a/include/ipa/ipa_controls.h
+++ b/include/ipa/ipa_controls.h
@@ -7,6 +7,8 @@ 
 #ifndef __LIBCAMERA_IPA_CONTROLS_H__
 #define __LIBCAMERA_IPA_CONTROLS_H__
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp
index 6ea71bc6dc46..dd3ff9a0d467 100644
--- a/src/libcamera/ipa_controls.cpp
+++ b/src/libcamera/ipa_controls.cpp
@@ -2,9 +2,11 @@ 
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * ipa_controls.h - IPA control handling
+ * ipa_controls.cpp - IPA control handling
  */
 
+#include <ipa/ipa_controls.h>
+
 /**
  * \file ipa_controls.h
  * \brief Type definitions for serialized controls