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

Avoid weird NPE and don't obfuscate anymore -- no need

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2698 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-04-27 12:23:55 +00:00
parent 5d3a52df9c
commit 8758602883
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/proguard-android-optimize.txt
View file

@ -32,6 +32,10 @@
#-keep class com.google.zxing.client.android.camera.exposure.** #-keep class com.google.zxing.client.android.camera.exposure.**
-keep class com.google.zxing.client.android.common.executor.** -keep class com.google.zxing.client.android.common.executor.**
# ADDED
-dontobfuscate
-useuniqueclassmembernames
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * { -keepclasseswithmembernames class * {
native <methods>; native <methods>;

2
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -479,12 +479,14 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
} }
private static void drawLine(Canvas canvas, Paint paint, ResultPoint a, ResultPoint b, float scaleFactor) { private static void drawLine(Canvas canvas, Paint paint, ResultPoint a, ResultPoint b, float scaleFactor) {
if (a != null && b != null) {
canvas.drawLine(scaleFactor * a.getX(), canvas.drawLine(scaleFactor * a.getX(),
scaleFactor * a.getY(), scaleFactor * a.getY(),
scaleFactor * b.getX(), scaleFactor * b.getX(),
scaleFactor * b.getY(), scaleFactor * b.getY(),
paint); paint);
} }
}
// Put up our own UI for how to handle the decoded contents. // Put up our own UI for how to handle the decoded contents.
private void handleDecodeInternally(Result rawResult, ResultHandler resultHandler, Bitmap barcode) { private void handleDecodeInternally(Result rawResult, ResultHandler resultHandler, Bitmap barcode) {