summaryrefslogtreecommitdiff
path: root/src/android
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/android
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/android')
-rw-r--r--src/android/camera_buffer.h3
-rw-r--r--src/android/jpeg/encoder.h3
-rw-r--r--src/android/jpeg/exif.h3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index e850c4e3..2617ff6b 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -10,8 +10,7 @@
#include <hardware/camera3.h>
#include <libcamera/base/class.h>
-
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
class CameraBuffer final : public libcamera::Extensible
{
diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h
index 8d449369..28e7f92a 100644
--- a/src/android/jpeg/encoder.h
+++ b/src/android/jpeg/encoder.h
@@ -7,8 +7,9 @@
#ifndef __ANDROID_JPEG_ENCODER_H__
#define __ANDROID_JPEG_ENCODER_H__
+#include <libcamera/base/span.h>
+
#include <libcamera/buffer.h>
-#include <libcamera/span.h>
#include <libcamera/stream.h>
class Encoder
diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h
index 8aa1b123..23b0e097 100644
--- a/src/android/jpeg/exif.h
+++ b/src/android/jpeg/exif.h
@@ -13,8 +13,9 @@
#include <libexif/exif-data.h>
+#include <libcamera/base/span.h>
+
#include <libcamera/geometry.h>
-#include <libcamera/span.h>
class Exif
{