[libcamera-devel] [PATCH 3/3] libcamera: Use "..." instead of <...> consistently for internal headers

Laurent Pinchart laurent.pinchart at ideasonboard.com
Thu May 26 13:00:09 CEST 2022


libcamera uses double quotes for #include directives for internal
headers. A few <...> have found their way in the code base over time.
Fix them.

While at it, move an Android header include to the right location.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 src/android/camera_hal_config.cpp | 6 +++---
 src/ipa/rkisp1/rkisp1.cpp         | 2 +-
 test/yaml-parser.cpp              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index 28072cb86285..8ba8738cc6b6 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -10,11 +10,11 @@
 #include <stdlib.h>
 #include <string>
 
-#include <hardware/camera3.h>
-
 #include <libcamera/base/log.h>
 
-#include <libcamera/internal/yaml_parser.h>
+#include "libcamera/internal/yaml_parser.h"
+
+#include <hardware/camera3.h>
 
 using namespace libcamera;
 
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index c818a6d71afc..7d6f0b39bb78 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -23,7 +23,7 @@
 #include <libcamera/ipa/rkisp1_ipa_interface.h>
 #include <libcamera/request.h>
 
-#include <libcamera/internal/mapped_framebuffer.h>
+#include "libcamera/internal/mapped_framebuffer.h"
 
 #include "algorithms/agc.h"
 #include "algorithms/algorithm.h"
diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp
index 652adf53d0cc..5315d99fae5d 100644
--- a/test/yaml-parser.cpp
+++ b/test/yaml-parser.cpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <unistd.h>
 
-#include <libcamera/internal/yaml_parser.h>
+#include "libcamera/internal/yaml_parser.h"
 
 #include "test.h"
 
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list