apps: cam: Fix include order
diff mbox series

Message ID 20250317215705.14219-1-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • apps: cam: Fix include order
Related show

Commit Message

Laurent Pinchart March 17, 2025, 9:57 p.m. UTC 
Several .cpp files in the cam application don't include their
corresponding header first, as usually done by libcamera to ensure that
headers are self-contained. Reorder headers to fix it. This shows
through a compilation error that file_sink.h is missing
libcamera/controls.h, fix it as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/apps/cam/camera_session.cpp | 3 ++-
 src/apps/cam/file_sink.cpp      | 4 ++--
 src/apps/cam/file_sink.h        | 1 +
 src/apps/cam/main.cpp           | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)


base-commit: 39419ce431dbd4f34d8772bd31bb7f44a3534f86
--
Regards,

Laurent Pinchart

Comments

Kieran Bingham March 17, 2025, 10:03 p.m. UTC | #1 
Quoting Laurent Pinchart (2025-03-17 21:57:05)
> Several .cpp files in the cam application don't include their
> corresponding header first, as usually done by libcamera to ensure that
> headers are self-contained. Reorder headers to fix it. This shows
> through a compilation error that file_sink.h is missing
> libcamera/controls.h, fix it as well.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Easy tag:


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

> ---
>  src/apps/cam/camera_session.cpp | 3 ++-
>  src/apps/cam/file_sink.cpp      | 4 ++--
>  src/apps/cam/file_sink.h        | 1 +
>  src/apps/cam/main.cpp           | 3 ++-
>  4 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
> index 9e93482775c3..a352494bed57 100644
> --- a/src/apps/cam/camera_session.cpp
> +++ b/src/apps/cam/camera_session.cpp
> @@ -5,6 +5,8 @@
>   * Camera capture session
>   */
> 
> +#include "camera_session.h"
> +
>  #include <iomanip>
>  #include <iostream>
>  #include <limits.h>
> @@ -16,7 +18,6 @@
>  #include "../common/event_loop.h"
>  #include "../common/stream_options.h"
> 
> -#include "camera_session.h"
>  #include "capture_script.h"
>  #include "file_sink.h"
>  #ifdef HAVE_KMS
> diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp
> index 76e21db9bf9a..65794a2f90a8 100644
> --- a/src/apps/cam/file_sink.cpp
> +++ b/src/apps/cam/file_sink.cpp
> @@ -5,6 +5,8 @@
>   * File Sink
>   */
> 
> +#include "file_sink.h"
> +
>  #include <array>
>  #include <assert.h>
>  #include <fcntl.h>
> @@ -21,8 +23,6 @@
>  #include "../common/image.h"
>  #include "../common/ppm_writer.h"
> 
> -#include "file_sink.h"
> -
>  using namespace libcamera;
> 
>  FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera,
> diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h
> index 71b7fe0feab5..26cd61b36d04 100644
> --- a/src/apps/cam/file_sink.h
> +++ b/src/apps/cam/file_sink.h
> @@ -11,6 +11,7 @@
>  #include <memory>
>  #include <string>
> 
> +#include <libcamera/controls.h>
>  #include <libcamera/stream.h>
> 
>  #include "frame_sink.h"
> diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp
> index 460dbc813060..fa266eca6d30 100644
> --- a/src/apps/cam/main.cpp
> +++ b/src/apps/cam/main.cpp
> @@ -5,6 +5,8 @@
>   * cam - The libcamera swiss army knife
>   */
> 
> +#include "main.h"
> +
>  #include <atomic>
>  #include <iomanip>
>  #include <iostream>
> @@ -19,7 +21,6 @@
>  #include "../common/stream_options.h"
> 
>  #include "camera_session.h"
> -#include "main.h"
> 
>  using namespace libcamera;
> 
> 
> base-commit: 39419ce431dbd4f34d8772bd31bb7f44a3534f86
> --
> Regards,
> 
> Laurent Pinchart
>
Stefan Klug March 18, 2025, 5:42 a.m. UTC | #2 
Hi Laurent,

Thank you for the patch. 

On Mon, Mar 17, 2025 at 11:57:05PM +0200, Laurent Pinchart wrote:
> Several .cpp files in the cam application don't include their
> corresponding header first, as usually done by libcamera to ensure that
> headers are self-contained. Reorder headers to fix it. This shows
> through a compilation error that file_sink.h is missing
> libcamera/controls.h, fix it as well.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> 

Regards,
Stefan

> ---
>  src/apps/cam/camera_session.cpp | 3 ++-
>  src/apps/cam/file_sink.cpp      | 4 ++--
>  src/apps/cam/file_sink.h        | 1 +
>  src/apps/cam/main.cpp           | 3 ++-
>  4 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
> index 9e93482775c3..a352494bed57 100644
> --- a/src/apps/cam/camera_session.cpp
> +++ b/src/apps/cam/camera_session.cpp
> @@ -5,6 +5,8 @@
>   * Camera capture session
>   */
> 
> +#include "camera_session.h"
> +
>  #include <iomanip>
>  #include <iostream>
>  #include <limits.h>
> @@ -16,7 +18,6 @@
>  #include "../common/event_loop.h"
>  #include "../common/stream_options.h"
> 
> -#include "camera_session.h"
>  #include "capture_script.h"
>  #include "file_sink.h"
>  #ifdef HAVE_KMS
> diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp
> index 76e21db9bf9a..65794a2f90a8 100644
> --- a/src/apps/cam/file_sink.cpp
> +++ b/src/apps/cam/file_sink.cpp
> @@ -5,6 +5,8 @@
>   * File Sink
>   */
> 
> +#include "file_sink.h"
> +
>  #include <array>
>  #include <assert.h>
>  #include <fcntl.h>
> @@ -21,8 +23,6 @@
>  #include "../common/image.h"
>  #include "../common/ppm_writer.h"
> 
> -#include "file_sink.h"
> -
>  using namespace libcamera;
> 
>  FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera,
> diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h
> index 71b7fe0feab5..26cd61b36d04 100644
> --- a/src/apps/cam/file_sink.h
> +++ b/src/apps/cam/file_sink.h
> @@ -11,6 +11,7 @@
>  #include <memory>
>  #include <string>
> 
> +#include <libcamera/controls.h>
>  #include <libcamera/stream.h>
> 
>  #include "frame_sink.h"
> diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp
> index 460dbc813060..fa266eca6d30 100644
> --- a/src/apps/cam/main.cpp
> +++ b/src/apps/cam/main.cpp
> @@ -5,6 +5,8 @@
>   * cam - The libcamera swiss army knife
>   */
> 
> +#include "main.h"
> +
>  #include <atomic>
>  #include <iomanip>
>  #include <iostream>
> @@ -19,7 +21,6 @@
>  #include "../common/stream_options.h"
> 
>  #include "camera_session.h"
> -#include "main.h"
> 
>  using namespace libcamera;
> 
> 
> base-commit: 39419ce431dbd4f34d8772bd31bb7f44a3534f86
> --
> Regards,
> 
> Laurent Pinchart
>

Patch
diff mbox series 

diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
index 9e93482775c3..a352494bed57 100644
--- a/src/apps/cam/camera_session.cpp
+++ b/src/apps/cam/camera_session.cpp
@@ -5,6 +5,8 @@ 
  * Camera capture session
  */

+#include "camera_session.h"
+
 #include <iomanip>
 #include <iostream>
 #include <limits.h>
@@ -16,7 +18,6 @@ 
 #include "../common/event_loop.h"
 #include "../common/stream_options.h"

-#include "camera_session.h"
 #include "capture_script.h"
 #include "file_sink.h"
 #ifdef HAVE_KMS
diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp
index 76e21db9bf9a..65794a2f90a8 100644
--- a/src/apps/cam/file_sink.cpp
+++ b/src/apps/cam/file_sink.cpp
@@ -5,6 +5,8 @@ 
  * File Sink
  */

+#include "file_sink.h"
+
 #include <array>
 #include <assert.h>
 #include <fcntl.h>
@@ -21,8 +23,6 @@ 
 #include "../common/image.h"
 #include "../common/ppm_writer.h"

-#include "file_sink.h"
-
 using namespace libcamera;

 FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera,
diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h
index 71b7fe0feab5..26cd61b36d04 100644
--- a/src/apps/cam/file_sink.h
+++ b/src/apps/cam/file_sink.h
@@ -11,6 +11,7 @@ 
 #include <memory>
 #include <string>

+#include <libcamera/controls.h>
 #include <libcamera/stream.h>

 #include "frame_sink.h"
diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp
index 460dbc813060..fa266eca6d30 100644
--- a/src/apps/cam/main.cpp
+++ b/src/apps/cam/main.cpp
@@ -5,6 +5,8 @@ 
  * cam - The libcamera swiss army knife
  */

+#include "main.h"
+
 #include <atomic>
 #include <iomanip>
 #include <iostream>
@@ -19,7 +21,6 @@ 
 #include "../common/stream_options.h"

 #include "camera_session.h"
-#include "main.h"

 using namespace libcamera;