Updated Branches: refs/heads/master 401c2f42f -> f095284fa
CB-1016: Zero width or height in getPicture throws java.lang.ArithmeticException Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/f095284f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/f095284f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/f095284f Branch: refs/heads/master Commit: f095284faaa27ae69e11807e940e9f57293db8a8 Parents: 401c2f4 Author: macdonst <simon.macdon...@gmail.com> Authored: Sat Jul 7 22:19:55 2012 -0400 Committer: macdonst <simon.macdon...@gmail.com> Committed: Sat Jul 7 22:19:55 2012 -0400 ---------------------------------------------------------------------- .../src/org/apache/cordova/CameraLauncher.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/f095284f/framework/src/org/apache/cordova/CameraLauncher.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java index a85c97b..6d05c64 100755 --- a/framework/src/org/apache/cordova/CameraLauncher.java +++ b/framework/src/org/apache/cordova/CameraLauncher.java @@ -142,6 +142,15 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie this.correctOrientation = args.getBoolean(8); this.saveToPhotoAlbum = args.getBoolean(9); + // If the user specifies a 0 or smaller width/height + // make it -1 so later comparrisions succeed + if (this.targetWidth < 1) { + this.targetWidth = -1; + } + if (this.targetHeight < 1) { + this.targetHeight = -1; + } + if (srcType == CAMERA) { this.takePicture(destType, encodingType); }
