Commit 8e2be8df authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Fix a new -Wconstant-logical-operand warning.

Bug: 857393
Change-Id: Ib852b5824b27443f7e1f5176646588fcbef195ed
Reviewed-on: https://chromium-review.googlesource.com/1118857Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571312}
parent 1043f20b
...@@ -83,9 +83,9 @@ mojom::RangePtr RetrieveControlRangeAndCurrent( ...@@ -83,9 +83,9 @@ mojom::RangePtr RetrieveControlRangeAndCurrent(
control_range->max = max; control_range->max = max;
control_range->step = step; control_range->step = step;
if (supported_modes != nullptr) { if (supported_modes != nullptr) {
if (flags && CameraControl_Flags_Auto) if (flags & CameraControl_Flags_Auto)
supported_modes->push_back(mojom::MeteringMode::CONTINUOUS); supported_modes->push_back(mojom::MeteringMode::CONTINUOUS);
if (flags && CameraControl_Flags_Manual) if (flags & CameraControl_Flags_Manual)
supported_modes->push_back(mojom::MeteringMode::MANUAL); supported_modes->push_back(mojom::MeteringMode::MANUAL);
} }
} }
...@@ -95,9 +95,9 @@ mojom::RangePtr RetrieveControlRangeAndCurrent( ...@@ -95,9 +95,9 @@ mojom::RangePtr RetrieveControlRangeAndCurrent(
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
control_range->current = current; control_range->current = current;
if (current_mode != nullptr) { if (current_mode != nullptr) {
if (flags && CameraControl_Flags_Auto) if (flags & CameraControl_Flags_Auto)
*current_mode = mojom::MeteringMode::CONTINUOUS; *current_mode = mojom::MeteringMode::CONTINUOUS;
else if (flags && CameraControl_Flags_Manual) else if (flags & CameraControl_Flags_Manual)
*current_mode = mojom::MeteringMode::MANUAL; *current_mode = mojom::MeteringMode::MANUAL;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment