diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2019-01-31 17:26:54 +0100 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2019-02-03 12:14:05 +0100 |
| commit | a78e56ecc2f214696910aff782f44fd5f9628112 (patch) | |
| tree | 9e7a94826a047abfa29b00de86a0d01e425215ab | |
| parent | 3fd5ade00c5da727184c6c5aa728d4ee27bb6ac2 (diff) | |
libcamera: v4l2_device: Rename format() method to getFormat()
Rename format() to getFormat() to reflect the v4l2 API names more
closely.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
| -rw-r--r-- | src/libcamera/include/v4l2_device.h | 2 | ||||
| -rw-r--r-- | src/libcamera/v4l2_device.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h index f68b2b1d..70e3c005 100644 --- a/src/libcamera/include/v4l2_device.h +++ b/src/libcamera/include/v4l2_device.h @@ -86,7 +86,7 @@ public: const char *deviceName() const { return caps_.card(); } const char *busName() const { return caps_.bus_info(); } - int format(V4L2DeviceFormat *fmt); + int getFormat(V4L2DeviceFormat *fmt); int setFormat(V4L2DeviceFormat *fmt); private: diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 5c415d0b..26b6ff36 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -282,7 +282,7 @@ void V4L2Device::close() * \brief Retrieve the image format set on the V4L2 device * \return 0 for success, a negative error code otherwise */ -int V4L2Device::format(V4L2DeviceFormat *fmt) +int V4L2Device::getFormat(V4L2DeviceFormat *fmt) { return caps_.isMultiplanar() ? getFormatMultiplane(fmt) : getFormatSingleplane(fmt); |