summaryrefslogtreecommitdiff
path: root/src/libcamera/include
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-05-25 02:20:55 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-06-19 03:06:33 +0200
commitce02ea29cda94f065d857ae00101e2fef5467a40 (patch)
tree0dda3d96451acd515629f73adb592ff273c279f3 /src/libcamera/include
parentbe78ffbe9abbd0fa6aab7a76c4a56d655d7b7548 (diff)
libcamera: v4l2_subdevice: Replace FormatEnum with ImageFormats
Replace all usage of FormatEnum with ImageFormats and completely remove FormatEnum which is no longer needed. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/include')
-rw-r--r--src/libcamera/include/formats.h2
-rw-r--r--src/libcamera/include/v4l2_subdevice.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h
index 6ec83125..796d65f1 100644
--- a/src/libcamera/include/formats.h
+++ b/src/libcamera/include/formats.h
@@ -15,8 +15,6 @@
namespace libcamera {
-typedef std::map<unsigned int, std::vector<SizeRange>> FormatEnum;
-
class ImageFormats
{
public:
diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h
index c6fdf417..9afd28b6 100644
--- a/src/libcamera/include/v4l2_subdevice.h
+++ b/src/libcamera/include/v4l2_subdevice.h
@@ -45,7 +45,7 @@ public:
int setCrop(unsigned int pad, Rectangle *rect);
int setCompose(unsigned int pad, Rectangle *rect);
- FormatEnum formats(unsigned int pad);
+ ImageFormats formats(unsigned int pad);
int getFormat(unsigned int pad, V4L2SubdeviceFormat *format);
int setFormat(unsigned int pad, V4L2SubdeviceFormat *format);