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

Issue 344-related -- avoid NPE when previewFormatString is null

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1205 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-02-09 09:22:33 +00:00
parent 49601e62e5
commit 146c4e096f
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -287,8 +287,6 @@ final class CameraManager {
// This is the standard Android format which all devices are REQUIRED to support. // This is the standard Android format which all devices are REQUIRED to support.
// In theory, it's the only one we should ever care about. // In theory, it's the only one we should ever care about.
case PixelFormat.YCbCr_420_SP: case PixelFormat.YCbCr_420_SP:
return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top,
rect.width(), rect.height());
// This format has never been seen in the wild, but is compatible as we only care // This format has never been seen in the wild, but is compatible as we only care
// about the Y channel, so allow it. // about the Y channel, so allow it.
case PixelFormat.YCbCr_422_SP: case PixelFormat.YCbCr_422_SP:
@ -297,7 +295,7 @@ final class CameraManager {
default: default:
// The Samsung Moment incorrectly uses this variant instead of the 'sp' version. // The Samsung Moment incorrectly uses this variant instead of the 'sp' version.
// Fortunately, it too has all the Y data up front, so we can read it. // Fortunately, it too has all the Y data up front, so we can read it.
if (previewFormatString.equals("yuv420p")) { if ("yuv420p".equals(previewFormatString)) {
return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top, return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top,
rect.width(), rect.height()); rect.width(), rect.height());
} }