Finished work on the local binarizer and renamed it to HybridBinarizer. It uses the...

[zxing.git] / javase / src / com / google / zxing / client / j2se / ImageConverter.java

diff --git a/javase/src/com/google/zxing/client/j2se/ImageConverter.java b/javase/src/com/google/zxing/client/j2se/ImageConverter.java
index 83aab90..538e59a 100644 (file)
--- a/javase/src/com/google/zxing/client/j2se/ImageConverter.java
+++ b/javase/src/com/google/zxing/client/j2se/ImageConverter.java
@@ -21,7 +21,7 @@ import com.google.zxing.LuminanceSource;
 import com.google.zxing.ReaderException;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.GlobalHistogramBinarizer;
+import com.google.zxing.common.HybridBinarizer;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -55,12 +55,12 @@ public final class ImageConverter {
 
   public static void main(String[] args) throws Exception {
     for (String arg : args) {
-      if (arg.equals("-row")) {
+      if ("-row".equals(arg)) {
         rowSampling = true;
-      } else if (arg.equals("-2d")) {
+      } else if ("-2d".equals(arg)) {
         rowSampling = false;
       } else if (arg.startsWith("-")) {
-        System.out.println("Ignoring unrecognized option: " + arg);
+        System.err.println("Ignoring unrecognized option: " + arg);
       }
     }
     for (String arg : args) {
@@ -96,7 +96,7 @@ public final class ImageConverter {
   private static void convertImage(URI uri) throws IOException {
     BufferedImage image = ImageIO.read(uri.toURL());
     LuminanceSource source = new BufferedImageLuminanceSource(image);
-    BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));
+    BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
     int width = bitmap.getWidth();
     int height = bitmap.getHeight();
 
@@ -140,7 +140,8 @@ public final class ImageConverter {
   private static File getFileOfUri(URI uri) {
     String name = uri.getPath();
     int slashPos = name.lastIndexOf((int) '/');
-    String parent, basename;
+    String parent;
+    String basename;
     if (slashPos != -1 && slashPos != name.length() - 1) {
       parent = name.substring(0, slashPos);
       basename = name.substring(slashPos + 1);