summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-08-10 01:05:51 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-08-12 14:57:35 +0300
commit43632663229d7cb4396ca1cd14cc87a0fd2a9602 (patch)
tree28a0f03311b7e1cc71e4a9ff10728a66547d3b59
parentb6369e7df246859c2a9f7196397413fb5e82d52f (diff)
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>
-rw-r--r--include/libcamera/base/file.h5
-rw-r--r--include/libcamera/ipa/ipa_interface.h3
-rw-r--r--src/gstreamer/gstlibcamerapool.cpp1
-rw-r--r--src/ipa/libipa/camera_sensor_helper.h3
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>