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

Merge pull request #283 from mertemin/patch-1

Browse source 
Removing unnecessary code from CameraManager
This commit is contained in:
Sean Owen 2015-01-08 09:49:51 +00:00
parent c676bdbb86 8846890006
commit ccdaf97e1b
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,12 +77,7 @@ public final class CameraManager {
Camera theCamera = camera; Camera theCamera = camera;
if (theCamera == null) { if (theCamera == null) {
if (requestedCameraId >= 0) {
theCamera = OpenCameraInterface.open(requestedCameraId); theCamera = OpenCameraInterface.open(requestedCameraId);
} else {
theCamera = OpenCameraInterface.open();
}
if (theCamera == null) { if (theCamera == null) {
throw new IOException(); throw new IOException();
} }

10
android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
View file

@ -75,14 +75,4 @@ public final class OpenCameraInterface {
return camera; return camera;
} }
/**
* Opens a rear-facing camera with {@link Camera#open(int)}, if one exists, or opens camera 0.
*
* @return handle to {@link Camera} that was opened
*/
public static Camera open() {
return open(-1);
}
} }