summaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-11-25 09:48:59 -0800
committerNick Desaulniers <ndesaulniers@google.com>2019-11-25 09:48:59 -0800
commitced12830a96a5008f86da038091d1562e2bc9813 (patch)
tree73af2c0463ed4ea68c83656f021653e921aacd8e /devices
parent656a727ee23a840b112ec2b08412a07ab2c1fd02 (diff)
downloadcamera-ced12830a96a5008f86da038091d1562e2bc9813.tar.gz
hardware: google: camera: fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: lunch sdk_gphone_x86_64-userdebug && mm Change-Id: I48ce873181cc3af3d29346021636853476664f53 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Diffstat (limited to 'devices')
-rw-r--r--devices/EmulatedCamera/hwl/EmulatedCameraDeviceSessionHWLImpl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/devices/EmulatedCamera/hwl/EmulatedCameraDeviceSessionHWLImpl.cpp b/devices/EmulatedCamera/hwl/EmulatedCameraDeviceSessionHWLImpl.cpp
index fa67b52..6268707 100644
--- a/devices/EmulatedCamera/hwl/EmulatedCameraDeviceSessionHWLImpl.cpp
+++ b/devices/EmulatedCamera/hwl/EmulatedCameraDeviceSessionHWLImpl.cpp
@@ -158,8 +158,8 @@ status_t EmulatedCameraDeviceSessionHwlImpl::ConfigurePipeline(
*pipeline_id = pipelines_.size();
EmulatedPipeline emulated_pipeline{.cb = hwl_pipeline_callback,
- .pipeline_id = *pipeline_id,
- .physical_camera_id = physical_camera_id};
+ .physical_camera_id = physical_camera_id,
+ .pipeline_id = *pipeline_id,};
emulated_pipeline.streams.reserve(request_config.streams.size());
for (const auto& stream : request_config.streams) {
@@ -181,8 +181,8 @@ status_t EmulatedCameraDeviceSessionHwlImpl::ConfigurePipeline(
.physical_camera_id = stream.physical_camera_id},
.width = stream.width,
.height = stream.height,
- .is_input = is_input,
- .buffer_size = stream.buffer_size}));
+ .buffer_size = stream.buffer_size,
+ .is_input = is_input,}));
}
pipelines_.push_back(emulated_pipeline);