diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-25 20:22:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-25 20:22:26 +0000 |
| commit | 7904e9c2d777674adf3f71f438001824773ef323 (patch) | |
| tree | 50c5e9444df8896adb2dbab8d8a2834c64906c00 | |
| parent | e1c003dc1154fd6b494b506fc5cd844cfe52d98b (diff) | |
| parent | de9c47bdb9c52fac078f2165a05507ff6d6a527b (diff) | |
| download | libhardware-o-mr1-iot-preview-8.tar.gz | |
Merge "camera 3_4: Fix compilation errors"android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -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 | ||||
| -rw-r--r-- | modules/camera/3_4/v4l2_gralloc.cpp | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/modules/camera/3_4/camera.cpp b/modules/camera/3_4/camera.cpp index 7f42eef6..83905ea8 100644 --- a/modules/camera/3_4/camera.cpp +++ b/modules/camera/3_4/camera.cpp @@ -499,7 +499,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)); } diff --git a/modules/camera/3_4/v4l2_gralloc.cpp b/modules/camera/3_4/v4l2_gralloc.cpp index 7da3c4e2..1c8ca48b 100644 --- a/modules/camera/3_4/v4l2_gralloc.cpp +++ b/modules/camera/3_4/v4l2_gralloc.cpp @@ -18,6 +18,7 @@ #include <linux/videodev2.h> +#include <cerrno> #include <cstdlib> #include <hardware/camera3.h> |