diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/camera_buffer.h | 3 | ||||
| -rw-r--r-- | src/android/jpeg/encoder.h | 3 | ||||
| -rw-r--r-- | src/android/jpeg/exif.h | 3 | ||||
| -rw-r--r-- | src/ipa/libipa/histogram.h | 2 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/cam_helper.hpp | 3 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/md_parser.hpp | 2 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/raspberrypi.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/control_serializer.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/ipa_module.cpp | 3 | ||||
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1_path.h | 2 |
10 files changed, 12 insertions, 13 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 { 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" 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" |