NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: v4l2_device: Fix variable-sized object initialization

Browse source 
Compiling with clang renders errors as a variable-sized arrays are not
allowed to be initialized. Solve this by using memset() for v4l2Ctrls
which is the only one of the two arrays that needs to be zeroed.

    ../../src/libcamera/v4l2_device.cpp:155:37: error: variable-sized object may not be initialized
        const V4L2ControlInfo *controlInfo[count] = {};
                                           ^~~~~
    ../../src/libcamera/v4l2_device.cpp:156:36: error: variable-sized object may not be initialized
	    struct v4l2_ext_control v4l2Ctrls[count] = {};
					      ^~~~~
    ../../src/libcamera/v4l2_device.cpp:227:37: error: variable-sized object may not be initialized
	    const V4L2ControlInfo *controlInfo[count] = {};
					       ^~~~~
    ../../src/libcamera/v4l2_device.cpp:228:36: error: variable-sized object may not be initialized
	    struct v4l2_ext_control v4l2Ctrls[count] = {};
					      ^~~~~
Fixes: eb068f4e67 ("libcamera: v4l2_device: Implement get and set controls")
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Niklas Söderlund 2019-06-26 19:25:58 +02:00
parent 6948ec44c7
commit 0116a940ba
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libcamera/v4l2_device.cpp
View file

@ -152,8 +152,10 @@ int V4L2Device::getControls(V4L2ControlList *ctrls)
if (count == 0) if (count == 0)
return 0; return 0;
const V4L2ControlInfo *controlInfo[count] = {}; const V4L2ControlInfo *controlInfo[count];
struct v4l2_ext_control v4l2Ctrls[count] = {}; struct v4l2_ext_control v4l2Ctrls[count];
memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));
for (unsigned int i = 0; i < count; ++i) { for (unsigned int i = 0; i < count; ++i) {
const V4L2Control *ctrl = ctrls->getByIndex(i); const V4L2Control *ctrl = ctrls->getByIndex(i);
const V4L2ControlInfo *info = getControlInfo(ctrl->id()); const V4L2ControlInfo *info = getControlInfo(ctrl->id());
@ -224,8 +226,9 @@ int V4L2Device::setControls(V4L2ControlList *ctrls)
if (count == 0) if (count == 0)
return 0; return 0;
const V4L2ControlInfo *controlInfo[count] = {}; const V4L2ControlInfo *controlInfo[count];
struct v4l2_ext_control v4l2Ctrls[count] = {}; struct v4l2_ext_control v4l2Ctrls[count];
memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));
for (unsigned int i = 0; i < count; ++i) { for (unsigned int i = 0; i < count; ++i) {
const V4L2Control *ctrl = ctrls->getByIndex(i); const V4L2Control *ctrl = ctrls->getByIndex(i);