summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2013-11-08 02:06:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-11-08 02:06:18 +0000
commit6b151ca8833aa7271e311436dad97588b71b7a38 (patch)
tree738e658531f3ab8c608addbe8eda32cf61b33f91
parent84309165ca52b7446e388c13127fd6e305833f24 (diff)
parentb0b6afb44269263afa080ecc643f2c4866adfb38 (diff)
downloadandroid_device_generic_goldfish-6b151ca8833aa7271e311436dad97588b71b7a38.tar.gz
android_device_generic_goldfish-6b151ca8833aa7271e311436dad97588b71b7a38.tar.bz2
android_device_generic_goldfish-6b151ca8833aa7271e311436dad97588b71b7a38.zip
Merge "Catch divide by zero case in drawCheckerBoard() function."
-rwxr-xr-xcamera/EmulatedFakeCameraDevice.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/camera/EmulatedFakeCameraDevice.cpp b/camera/EmulatedFakeCameraDevice.cpp
index 0bc4c54..4afadc1 100755
--- a/camera/EmulatedFakeCameraDevice.cpp
+++ b/camera/EmulatedFakeCameraDevice.cpp
@@ -243,6 +243,13 @@ void EmulatedFakeCameraDevice::drawCheckerboard()
const int size = mFrameWidth / 10;
bool black = true;
+ if (size == 0) {
+ // When this happens, it happens at a very high rate,
+ // so don't log any messages and just return.
+ return;
+ }
+
+
if((mCheckX / size) & 1)
black = false;
if((mCheckY / size) & 1)