diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-24 23:10:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-24 23:10:34 +0000 |
commit | 6accb1de92df81bcad971475c4560edcbc6e28c9 (patch) | |
tree | b41ec1e2f087b6c80f9da0b6033e5da7ec3cb80b | |
parent | a6e13b1c1d791b5bec9fd96780a5e45b708240b8 (diff) | |
parent | 9df082e93368ae2cc86e706f1f106a4422df1e42 (diff) | |
download | libhardware-6accb1de92df81bcad971475c4560edcbc6e28c9.tar.gz |
Merge "camera 3_4: Fix compilation errors"
-rw-r--r-- | modules/camera/3_4/camera.cpp | 2 | ||||
-rw-r--r-- | modules/camera/3_4/request_tracker_test.cpp | 2 | ||||
-rw-r--r-- | modules/camera/3_4/static_properties_test.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/camera/3_4/camera.cpp b/modules/camera/3_4/camera.cpp index 0f9e3784..79dca0b8 100644 --- a/modules/camera/3_4/camera.cpp +++ b/modules/camera/3_4/camera.cpp @@ -500,7 +500,7 @@ void Camera::sendResult(std::shared_ptr<CaptureRequest> request) { camera3_capture_result_t result { request->frame_number, request->settings.getAndLock(), - request->output_buffers.size(), + static_cast<uint32_t>(request->output_buffers.size()), request->output_buffers.data(), request->input_buffer.get(), 1 // Total result; only 1 part. diff --git a/modules/camera/3_4/request_tracker_test.cpp b/modules/camera/3_4/request_tracker_test.cpp index a68ff57f..8b73bd89 100644 --- a/modules/camera/3_4/request_tracker_test.cpp +++ b/modules/camera/3_4/request_tracker_test.cpp @@ -35,7 +35,7 @@ class RequestTrackerTest : public Test { stream2_.max_buffers = 3; dut_.reset(new RequestTracker()); streams_ = {&stream1_, &stream2_}; - camera3_stream_configuration_t config{streams_.size(), streams_.data(), 0}; + camera3_stream_configuration_t config{static_cast<uint32_t>(streams_.size()), streams_.data(), 0}; dut_->SetStreamConfiguration(config); } diff --git a/modules/camera/3_4/static_properties_test.cpp b/modules/camera/3_4/static_properties_test.cpp index e78e3437..2cdb9d4d 100644 --- a/modules/camera/3_4/static_properties_test.cpp +++ b/modules/camera/3_4/static_properties_test.cpp @@ -107,7 +107,7 @@ class StaticPropertiesTest : public Test { stream_addresses.push_back(&streams[i]); } camera3_stream_configuration_t config = { - stream_addresses.size(), + static_cast<uint32_t>(stream_addresses.size()), stream_addresses.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; PrepareDefaultDUT(); @@ -443,7 +443,7 @@ TEST_F(StaticPropertiesTest, ConfigureEmptyStreams) { TEST_F(StaticPropertiesTest, ConfigureNullStreams) { std::vector<camera3_stream_t*> streams(2, nullptr); camera3_stream_configuration_t config = { - streams.size(), streams.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; + static_cast<uint32_t>(streams.size()), streams.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; PrepareDefaultDUT(); EXPECT_FALSE(dut_->StreamConfigurationSupported(&config)); } |