Refactored the MonochromeBitmapSource class hierarchy into LuminanceSource, Binarizer...

[zxing.git] / rim / src / com / google / zxing / client / rim / ZXingLMMainScreen.java

diff --git a/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java b/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
index 7c59ac2..16f229e 100644 (file)
--- a/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
+++ b/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
@@ -16,13 +16,15 @@
 \r
 package com.google.zxing.client.rim;\r
 \r
+import com.google.zxing.BinaryBitmap;\r
 import com.google.zxing.DecodeHintType;\r
-import com.google.zxing.MonochromeBitmapSource;\r
+import com.google.zxing.LuminanceSource;\r
 import com.google.zxing.MultiFormatReader;\r
 import com.google.zxing.Reader;\r
 import com.google.zxing.ReaderException;\r
 import com.google.zxing.Result;\r
-import com.google.zxing.client.j2me.LCDUIImageMonochromeBitmapSource;\r
+import com.google.zxing.common.GlobalHistogramBinarizer;\r
+import com.google.zxing.client.j2me.LCDUIImageLuminanceSource;\r
 import com.google.zxing.client.rim.persistence.AppSettings;\r
 import com.google.zxing.client.rim.persistence.history.DecodeHistory;\r
 import com.google.zxing.client.rim.persistence.history.DecodeHistoryItem;\r
@@ -238,13 +240,14 @@ final class ZXingLMMainScreen extends MainScreen {
 \r
       if (capturedImage != null) {\r
         Log.info("Got image...");\r
-        MonochromeBitmapSource source = new LCDUIImageMonochromeBitmapSource(capturedImage);\r
+        LuminanceSource source = new LCDUIImageLuminanceSource(capturedImage);\r
+        BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));\r
         Result result;\r
         ReasonableTimer decodingTimer = null;\r
         try {\r
           decodingTimer = new ReasonableTimer();\r
           Log.info("Attempting to decode image...");\r
-          result = reader.decode(source, readerHints);\r
+          result = reader.decode(bitmap, readerHints);\r
           decodingTimer.finished();\r
         } catch (ReaderException e) {\r
           Log.error("Could not decode image: " + e);\r