[libcamera-devel,v9,01/18] pipeline: rkisp1: Reorder headers to appease the linter
diff mbox series

Message ID 20221216122939.256534-2-paul.elder@ideasonboard.com
State Superseded
Headers show
Series
  • lc-compliance: Add test to queue more requests than hardware depth
Related show

Commit Message

Paul Elder Dec. 16, 2022, 12:29 p.m. UTC
Re-order the header includes to appease the style-checker, so that when
we add headers later (specifically, property_ids.h), it won't complain.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
---
 src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jacopo Mondi Dec. 16, 2022, 1:41 p.m. UTC | #1
Hi Paul

On Fri, Dec 16, 2022 at 09:29:22PM +0900, Paul Elder via libcamera-devel wrote:
> Re-order the header includes to appease the style-checker, so that when
> we add headers later (specifically, property_ids.h), it won't complain.
>

If it please the tool and avoid later conflicts..

> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index eb9ad65c..f658d75e 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -23,11 +23,11 @@
>  #include <libcamera/control_ids.h>
>  #include <libcamera/formats.h>
>  #include <libcamera/framebuffer.h>
> +#include <libcamera/request.h>
> +#include <libcamera/stream.h>

However I would have expected checkstyle to require an empty line here

Anyway, glory glory to the holy tool
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

>  #include <libcamera/ipa/core_ipa_interface.h>
>  #include <libcamera/ipa/rkisp1_ipa_interface.h>
>  #include <libcamera/ipa/rkisp1_ipa_proxy.h>
> -#include <libcamera/request.h>
> -#include <libcamera/stream.h>
>
>  #include "libcamera/internal/camera.h"
>  #include "libcamera/internal/camera_sensor.h"
> --
> 2.35.1
>
Umang Jain Dec. 21, 2022, 8:26 a.m. UTC | #2
Hi Paul,

Thank you for the patch.

On 12/16/22 5:59 PM, Paul Elder via libcamera-devel wrote:
> Re-order the header includes to appease the style-checker, so that when
> we add headers later (specifically, property_ids.h), it won't complain.
>
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>

Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

> ---
>   src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index eb9ad65c..f658d75e 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -23,11 +23,11 @@
>   #include <libcamera/control_ids.h>
>   #include <libcamera/formats.h>
>   #include <libcamera/framebuffer.h>
> +#include <libcamera/request.h>
> +#include <libcamera/stream.h>
>   #include <libcamera/ipa/core_ipa_interface.h>
>   #include <libcamera/ipa/rkisp1_ipa_interface.h>
>   #include <libcamera/ipa/rkisp1_ipa_proxy.h>
> -#include <libcamera/request.h>
> -#include <libcamera/stream.h>
>   
>   #include "libcamera/internal/camera.h"
>   #include "libcamera/internal/camera_sensor.h"

Patch
diff mbox series

diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index eb9ad65c..f658d75e 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -23,11 +23,11 @@ 
 #include <libcamera/control_ids.h>
 #include <libcamera/formats.h>
 #include <libcamera/framebuffer.h>
+#include <libcamera/request.h>
+#include <libcamera/stream.h>
 #include <libcamera/ipa/core_ipa_interface.h>
 #include <libcamera/ipa/rkisp1_ipa_interface.h>
 #include <libcamera/ipa/rkisp1_ipa_proxy.h>
-#include <libcamera/request.h>
-#include <libcamera/stream.h>
 
 #include "libcamera/internal/camera.h"
 #include "libcamera/internal/camera_sensor.h"