summaryrefslogtreecommitdiff
path: root/src/libcamera
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 02:15:54 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 16:11:11 +0100
commitb71e8c2f39d823891aab4c681cccab9af5a49406 (patch)
tree62b79f3a300a54b08501bf0becd533db609e6937 /src/libcamera
parentf9ee72430735f749fb7d8fd4a8fe01ca88dc1f88 (diff)
libcamera/base: Move span to base library
Move span, and adjust the Doxygen exclusion as well. Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/libcamera')
-rw-r--r--src/libcamera/control_serializer.cpp2
-rw-r--r--src/libcamera/ipa_module.cpp3
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1_path.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp
index dd5a2608..30046628 100644
--- a/src/libcamera/control_serializer.cpp
+++ b/src/libcamera/control_serializer.cpp
@@ -12,11 +12,11 @@
#include <vector>
#include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
#include <libcamera/control_ids.h>
#include <libcamera/controls.h>
#include <libcamera/ipa/ipa_controls.h>
-#include <libcamera/span.h>
#include "libcamera/internal/byte_stream_buffer.h"
diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp
index 984c1fed..adfb8d40 100644
--- a/src/libcamera/ipa_module.cpp
+++ b/src/libcamera/ipa_module.cpp
@@ -21,10 +21,9 @@
#include <sys/types.h>
#include <unistd.h>
-#include <libcamera/span.h>
-
#include <libcamera/base/file.h>
#include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
#include <libcamera/base/utils.h>
#include "libcamera/internal/pipeline_handler.h"
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
index c185ac39..91757600 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
@@ -11,11 +11,11 @@
#include <vector>
#include <libcamera/base/signal.h>
+#include <libcamera/base/span.h>
#include <libcamera/camera.h>
#include <libcamera/geometry.h>
#include <libcamera/pixel_format.h>
-#include <libcamera/span.h>
#include "libcamera/internal/media_object.h"
#include "libcamera/internal/v4l2_videodevice.h"