From 93db610970a6c5b4e68eab04c8d452754eca0e4a Mon Sep 17 00:00:00 2001 From: srowen Date: Mon, 31 Mar 2008 19:04:38 +0000 Subject: [PATCH] Made the RGB to luminance approximation/optimization a little faster -- one less shift git-svn-id: https://zxing.googlecode.com/svn/trunk@327 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../zxing/client/android/RGBMonochromeBitmapSource.java | 6 +++--- .../zxing/client/android/RGBMonochromeBitmapSource.java | 6 +++--- .../zxing/client/j2me/LCDUIImageMonochromeBitmapSource.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android-m3/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java b/android-m3/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java index 6d3f2bd8f..100a9d466 100755 --- a/android-m3/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java +++ b/android-m3/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java @@ -140,9 +140,9 @@ final class RGBMonochromeBitmapSource implements MonochromeBitmapSource { // corrupts the conversion. Not significant for our purposes. // // But we can get even cleverer and eliminate a few shifts: - return (((pixel & 0x00FF0000) >> 8) + - ((pixel & 0x0000FF00) << 1) + - ((pixel & 0x000000FF) << 8)) >> 10; + return (((pixel & 0x00FF0000) >> 16) + + ((pixel & 0x0000FF00) >> 7) + + ( pixel & 0x000000FF )) >> 2; } } \ No newline at end of file diff --git a/android/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java b/android/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java index 6d3f2bd8f..100a9d466 100755 --- a/android/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java +++ b/android/src/com/google/zxing/client/android/RGBMonochromeBitmapSource.java @@ -140,9 +140,9 @@ final class RGBMonochromeBitmapSource implements MonochromeBitmapSource { // corrupts the conversion. Not significant for our purposes. // // But we can get even cleverer and eliminate a few shifts: - return (((pixel & 0x00FF0000) >> 8) + - ((pixel & 0x0000FF00) << 1) + - ((pixel & 0x000000FF) << 8)) >> 10; + return (((pixel & 0x00FF0000) >> 16) + + ((pixel & 0x0000FF00) >> 7) + + ( pixel & 0x000000FF )) >> 2; } } \ No newline at end of file diff --git a/javame/src/com/google/zxing/client/j2me/LCDUIImageMonochromeBitmapSource.java b/javame/src/com/google/zxing/client/j2me/LCDUIImageMonochromeBitmapSource.java index e567eddfb..cadb81532 100644 --- a/javame/src/com/google/zxing/client/j2me/LCDUIImageMonochromeBitmapSource.java +++ b/javame/src/com/google/zxing/client/j2me/LCDUIImageMonochromeBitmapSource.java @@ -134,9 +134,9 @@ public final class LCDUIImageMonochromeBitmapSource implements MonochromeBitmapS // corrupts the conversion. Not significant for our purposes. // // But we can get even cleverer and eliminate a few shifts: - return (((pixel & 0x00FF0000) >> 8) + - ((pixel & 0x0000FF00) << 1) + - ((pixel & 0x000000FF) << 8)) >> 10; + return (((pixel & 0x00FF0000) >> 16) + + ((pixel & 0x0000FF00) >> 7) + + ( pixel & 0x000000FF )) >> 2; } } \ No newline at end of file