From e1e932ea2069d3ae2b55b822c364789a65c2bc20 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Fri, 11 Oct 2019 13:40:19 -0700 Subject: [PATCH] [hardware][interfaces][camera] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Change-Id: I387d30e993719014da50207c7114b0003b9450c5 Signed-off-by: Nick Desaulniers --- camera/device/3.4/default/ExternalCameraDevice.cpp | 10 +++++----- .../device/3.4/default/ExternalCameraDeviceSession.cpp | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/camera/device/3.4/default/ExternalCameraDevice.cpp b/camera/device/3.4/default/ExternalCameraDevice.cpp index 9a2fddff88..f518a155a7 100644 --- a/camera/device/3.4/default/ExternalCameraDevice.cpp +++ b/camera/device/3.4/default/ExternalCameraDevice.cpp @@ -754,11 +754,11 @@ void ExternalCameraDevice::getFrameRateList( int fd, double fpsUpperBound, SupportedV4L2Format* format) { format->frameRates.clear(); - v4l2_frmivalenum frameInterval { - .pixel_format = format->fourcc, - .width = format->width, - .height = format->height, - .index = 0 + v4l2_frmivalenum frameInterval{ + .index = 0, + .pixel_format = format->fourcc, + .width = format->width, + .height = format->height, }; for (frameInterval.index = 0; diff --git a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp index dc5579ac67..9ff0d74687 100644 --- a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp +++ b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp @@ -2412,9 +2412,7 @@ int ExternalCameraDeviceSession::configureV4l2StreamLocked( mV4L2BufferCount = req_buffers.count; for (uint32_t i = 0; i < req_buffers.count; i++) { v4l2_buffer buffer = { - .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, - .index = i, - .memory = V4L2_MEMORY_MMAP}; + .index = i, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, .memory = V4L2_MEMORY_MMAP}; if (TEMP_FAILURE_RETRY(ioctl(mV4l2Fd.get(), VIDIOC_QUERYBUF, &buffer)) < 0) { ALOGE("%s: QUERYBUF %d failed: %s", __FUNCTION__, i, strerror(errno));