summaryrefslogtreecommitdiff
path: root/src/ipa
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/ipa
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/ipa')
-rw-r--r--src/ipa/libipa/histogram.h2
-rw-r--r--src/ipa/raspberrypi/cam_helper.hpp3
-rw-r--r--src/ipa/raspberrypi/md_parser.hpp2
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/ipa/libipa/histogram.h b/src/ipa/libipa/histogram.h
index e06f1884..c2761cb2 100644
--- a/src/ipa/libipa/histogram.h
+++ b/src/ipa/libipa/histogram.h
@@ -13,7 +13,7 @@
#include <vector>
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
namespace libcamera {
diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp
index a6664819..b19c95f6 100644
--- a/src/ipa/raspberrypi/cam_helper.hpp
+++ b/src/ipa/raspberrypi/cam_helper.hpp
@@ -8,8 +8,7 @@
#include <string>
-#include <libcamera/span.h>
-
+#include <libcamera/base/span.h>
#include <libcamera/base/utils.h>
#include "camera_mode.h"
diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp
index 65aab02d..8497216f 100644
--- a/src/ipa/raspberrypi/md_parser.hpp
+++ b/src/ipa/raspberrypi/md_parser.hpp
@@ -8,7 +8,7 @@
#include <stdint.h>
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
/*
* Camera metadata parser class. Usage as shown below.
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index a3f01449..4d09a84f 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -16,6 +16,7 @@
#include <linux/bcm2835-isp.h>
#include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
#include <libcamera/buffer.h>
#include <libcamera/control_ids.h>
@@ -26,7 +27,6 @@
#include <libcamera/ipa/raspberrypi.h>
#include <libcamera/ipa/raspberrypi_ipa_interface.h>
#include <libcamera/request.h>
-#include <libcamera/span.h>
#include "libcamera/internal/buffer.h"