mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Per Daniel -- don't check phone's preview size as we want to use screen size if possible

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1231 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-03-01 15:38:55 +00:00
parent f30410ff78
commit 9fab25f005
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -354,24 +354,17 @@ final class CameraManager {
private Point getCameraResolution(Camera.Parameters parameters) {
Point cameraResolution = null;
Camera.Size cameraPreviewSize = parameters.getPreviewSize();
if (cameraPreviewSize != null) {
Log.v(TAG, "Default preview size: " + cameraPreviewSize.width + ", " + cameraPreviewSize.height);
cameraResolution = new Point(cameraPreviewSize.width, cameraPreviewSize.height);
String previewSizeValueString = parameters.get("preview-size-values");
// saw this on Xperia
if (previewSizeValueString == null) {
previewSizeValueString = parameters.get("preview-size-value");
}
if (cameraResolution == null) {
String previewSizeValueString = parameters.get("preview-size-values");
// saw this on Xperia
if (previewSizeValueString == null) {
previewSizeValueString = parameters.get("preview-size-value");
}
if (previewSizeValueString != null) {
Log.v(TAG, "preview-size parameter: " + previewSizeValueString);
cameraResolution = findBestPreviewSizeValue(previewSizeValueString, screenResolution);
}
Point cameraResolution = null;
if (previewSizeValueString != null) {
Log.v(TAG, "preview-size parameter: " + previewSizeValueString);
cameraResolution = findBestPreviewSizeValue(previewSizeValueString, screenResolution);
}
if (cameraResolution == null) {