mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 13:04:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Look for mot-zoom-values

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1289 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-04-07 07:58:22 +00:00
parent 06a6a35ce1
commit e6b205cd21
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -418,6 +418,24 @@ final class CameraManager {
return null;
}
private static int findBestMotZoomValue(String stringValues, int tenDesiredZoom) {
int tenBestValue = 0;
for (String stringValue : COMMA_PATTERN.split(stringValues)) {
stringValue = stringValue.trim();
double value;
try {
value = Double.parseDouble(stringValue);
} catch (NumberFormatException nfe) {
return tenDesiredZoom;
}
int tenValue = (int) (10.0 * value);
if (Math.abs(tenDesiredZoom - value) < Math.abs(tenDesiredZoom - tenBestValue)) {
tenBestValue = tenValue;
}
}
return tenBestValue;
}
private void setFlash(Camera.Parameters parameters) {
// FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
parameters.set("flash-value", 2);
@ -458,10 +476,14 @@ final class CameraManager {
}
}
String motZoomValues = parameters.get("mot-zoom-values");
if (motZoomValues != null) {
tenDesiredZoom = findBestMotZoomValue(motZoomValues, tenDesiredZoom);
}
// Set zoom. This helps encourage the user to pull back.
// Some devices like the Behold have a zoom parameter
if (maxZoomString != null) {
if (maxZoomString != null || motZoomValues != null) {
parameters.set("zoom", String.valueOf(tenDesiredZoom / 10.0));
}