From 43632663229d7cb4396ca1cd14cc87a0fd2a9602 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 10 Aug 2024 01:05:51 +0300
Subject: libcamera: Fix header grouping

The libcamera coding style groups the C and C++ standard library headers
in a single group. Fix the few offenders in the source tree.

While at it, add a missing blank line between header groups in a
separate location.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
---
 include/libcamera/base/file.h         | 5 ++---
 include/libcamera/ipa/ipa_interface.h | 3 +--
 src/gstreamer/gstlibcamerapool.cpp    | 1 +
 src/ipa/libipa/camera_sensor_helper.h | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h
index 192668ab..6d3f106d 100644
--- a/include/libcamera/base/file.h
+++ b/include/libcamera/base/file.h
@@ -7,11 +7,10 @@
 
 #pragma once
 
-#include <stdint.h>
-#include <sys/types.h>
-
 #include <map>
+#include <stdint.h>
 #include <string>
+#include <sys/types.h>
 
 #include <libcamera/base/private.h>
 
diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
index 53cf5377..7c835e98 100644
--- a/include/libcamera/ipa/ipa_interface.h
+++ b/include/libcamera/ipa/ipa_interface.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
+#include <map>
 #include <stddef.h>
 #include <stdint.h>
-
-#include <map>
 #include <vector>
 
 #include <libcamera/base/flags.h>
diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp
index 0b1a5689..9cd7eccb 100644
--- a/src/gstreamer/gstlibcamerapool.cpp
+++ b/src/gstreamer/gstlibcamerapool.cpp
@@ -9,6 +9,7 @@
 #include "gstlibcamerapool.h"
 
 #include <deque>
+
 #include <libcamera/stream.h>
 
 #include "gstlibcamera-utils.h"
diff --git a/src/ipa/libipa/camera_sensor_helper.h b/src/ipa/libipa/camera_sensor_helper.h
index ac276e27..75868205 100644
--- a/src/ipa/libipa/camera_sensor_helper.h
+++ b/src/ipa/libipa/camera_sensor_helper.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include <memory>
 #include <optional>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
-- 
cgit v1.2.1