X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=javase%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fj2se%2FCommandLineRunner.java;h=8ac1de4d91e22bb5a7ebb59d5bb47df3157a0d04;hb=9aeefe94e7fe5485a83f16f4aa1997c610e5804f;hp=61ca47a94b6e2dfdb0c2c265dadb032b01b2dd9e;hpb=ac343e4ddc7af1f54c2d2634abb1be992d183a35;p=zxing.git

diff --git a/javase/src/com/google/zxing/client/j2se/CommandLineRunner.java b/javase/src/com/google/zxing/client/j2se/CommandLineRunner.java
index 61ca47a9..8ac1de4d 100644
--- a/javase/src/com/google/zxing/client/j2se/CommandLineRunner.java
+++ b/javase/src/com/google/zxing/client/j2se/CommandLineRunner.java
@@ -18,13 +18,10 @@ package com.google.zxing.client.j2se;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BinaryBitmap;
-import com.google.zxing.ChecksumException;
 import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
 import com.google.zxing.NotFoundException;
-import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ResultParser;
@@ -69,18 +66,28 @@ public final class CommandLineRunner {
     }
 
     boolean tryHarder = false;
+    boolean pureBarcode = false;
     boolean productsOnly = false;
     boolean dumpResults = false;
     boolean dumpBlackPoint = false;
+    int[] crop = null;
     for (String arg : args) {
       if ("--try_harder".equals(arg)) {
         tryHarder = true;
+      } else if ("--pure_barcode".equals(arg)) {
+        pureBarcode = true;
       } else if ("--products_only".equals(arg)) {
         productsOnly = true;
       } else if ("--dump_results".equals(arg)) {
         dumpResults = true;
       } else if ("--dump_black_point".equals(arg)) {
         dumpBlackPoint = true;
+      } else if (arg.startsWith("--crop")) {
+        crop = new int[4];
+        String[] tokens = arg.substring(7).split(",");
+        for (int i = 0; i < crop.length; i++) {
+          crop[i] = Integer.parseInt(tokens[i]);
+        }
       } else if (arg.startsWith("-")) {
         System.err.println("Unknown command line option " + arg);
         printUsage();
@@ -88,23 +95,25 @@ public final class CommandLineRunner {
       }
     }
 
-    Hashtable<DecodeHintType, Object> hints = buildHints(tryHarder, productsOnly);
+    Hashtable<DecodeHintType, Object> hints = buildHints(tryHarder, pureBarcode, productsOnly);
     for (String arg : args) {
       if (!arg.startsWith("--")) {
-        decodeOneArgument(arg, hints, dumpResults, dumpBlackPoint);
+        decodeOneArgument(arg, hints, dumpResults, dumpBlackPoint, crop);
       }
     }
   }
 
   // Manually turn on all formats, even those not yet considered production quality.
   private static Hashtable<DecodeHintType, Object> buildHints(boolean tryHarder,
-      boolean productsOnly) {
+                                                              boolean pureBarcode,
+                                                              boolean productsOnly) {
     Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
     Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(8);
     vector.addElement(BarcodeFormat.UPC_A);
     vector.addElement(BarcodeFormat.UPC_E);
     vector.addElement(BarcodeFormat.EAN_13);
     vector.addElement(BarcodeFormat.EAN_8);
+    vector.addElement(BarcodeFormat.RSS14);    
     if (!productsOnly) {
       vector.addElement(BarcodeFormat.CODE_39);
       vector.addElement(BarcodeFormat.CODE_128);
@@ -117,6 +126,9 @@ public final class CommandLineRunner {
     if (tryHarder) {
       hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
     }
+    if (pureBarcode) {
+      hints.put(DecodeHintType.PURE_BARCODE, Boolean.TRUE);
+    }
     return hints;
   }
 
@@ -124,13 +136,18 @@ public final class CommandLineRunner {
     System.err.println("Decode barcode images using the ZXing library\n");
     System.err.println("usage: CommandLineRunner { file | dir | url } [ options ]");
     System.err.println("  --try_harder: Use the TRY_HARDER hint, default is normal (mobile) mode");
+    System.err.println("  --pure_barcode: Input image is a pure monochrome barcode image, not a photo");
     System.err.println("  --products_only: Only decode the UPC and EAN families of barcodes");
     System.err.println("  --dump_results: Write the decoded contents to input.txt");
     System.err.println("  --dump_black_point: Compare black point algorithms as input.mono.png");
+    System.err.println("  --crop=left,top,width,height: Only examine cropped region of input image(s)");
   }
 
-  private static void decodeOneArgument(String argument, Hashtable<DecodeHintType, Object> hints,
-      boolean dumpResults, boolean dumpBlackPoint) throws IOException,
+  private static void decodeOneArgument(String argument,
+                                        Hashtable<DecodeHintType, Object> hints,
+                                        boolean dumpResults,
+                                        boolean dumpBlackPoint,
+                                        int[] crop) throws IOException,
       URISyntaxException {
 
     File inputFile = new File(argument);
@@ -148,7 +165,7 @@ public final class CommandLineRunner {
           if (filename.contains(".mono.png")) {
             continue;
           }
-          Result result = decode(input.toURI(), hints, dumpBlackPoint);
+          Result result = decode(input.toURI(), hints, dumpBlackPoint, crop);
           if (result != null) {
             successful++;
             if (dumpResults) {
@@ -160,13 +177,13 @@ public final class CommandLineRunner {
         System.out.println("\nDecoded " + successful + " files out of " + total +
             " successfully (" + (successful * 100 / total) + "%)\n");
       } else {
-        Result result = decode(inputFile.toURI(), hints, dumpBlackPoint);
+        Result result = decode(inputFile.toURI(), hints, dumpBlackPoint, crop);
         if (dumpResults) {
           dumpResult(inputFile, result);
         }
       }
     } else {
-      decode(new URI(argument), hints, dumpBlackPoint);
+      decode(new URI(argument), hints, dumpBlackPoint, crop);
     }
   }
 
@@ -189,8 +206,10 @@ public final class CommandLineRunner {
     }
   }
 
-  private static Result decode(URI uri, Hashtable<DecodeHintType, Object> hints,
-      boolean dumpBlackPoint) throws IOException {
+  private static Result decode(URI uri,
+                               Hashtable<DecodeHintType, Object> hints,
+                               boolean dumpBlackPoint,
+                               int[] crop) throws IOException {
     BufferedImage image;
     try {
       image = ImageIO.read(uri.toURL());
@@ -202,7 +221,12 @@ public final class CommandLineRunner {
       return null;
     }
     try {
-      LuminanceSource source = new BufferedImageLuminanceSource(image);
+      LuminanceSource source;
+      if (crop == null) {
+        source = new BufferedImageLuminanceSource(image);
+      } else {
+        source = new BufferedImageLuminanceSource(image, crop[0], crop[1], crop[2], crop[3]);
+      }
       BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
       if (dumpBlackPoint) {
         dumpBlackPoint(uri, image, bitmap);