Added a new blackbox test with extreme shadows and highlights. We do pretty poorly...

[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 5b5a5a4..313708a 100644 (file)
--- a/javase/src/com/google/zxing/client/j2se/ImageConverter.java
+++ b/javase/src/com/google/zxing/client/j2se/ImageConverter.java
@@ -16,17 +16,18 @@
 
 package com.google.zxing.client.j2se;
 
-import com.google.zxing.MonochromeBitmapSource;
 import com.google.zxing.BlackPointEstimationMethod;
+import com.google.zxing.MonochromeBitmapSource;
 import com.google.zxing.ReaderException;
 import com.google.zxing.common.BitArray;
 
-import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 
+import javax.imageio.ImageIO;
+
 /**
  * Utility application for evaluating the effectiveness of the BlackPointEstimator used by
  * MonochromeBitmapSource. Given a set of images on the command line, it converts each to a
@@ -65,6 +66,16 @@ public final class ImageConverter {
       if (inputFile.exists()) {
         if (inputFile.isDirectory()) {
           for (File input : inputFile.listFiles()) {
+            String filename = input.getName().toLowerCase();
+            // Skip hidden files and text files (the latter is found in the blackbox tests).
+            if (filename.startsWith(".") || filename.endsWith(".txt")) {
+              continue;
+            }
+            // Skip the results of dumping the black point.
+            if (filename.contains(".mono.png") || filename.contains(".row.png") ||
+                filename.contains(".2d.png")) {
+              continue;
+            }
             convertImage(input.toURI());
           }
         } else {
@@ -158,7 +169,7 @@ public final class ImageConverter {
         name = name.substring(0, dotpos);
       }
       String suffix = (sMethod == BlackPointEstimationMethod.ROW_SAMPLING) ? "row" : "2d";
-      result = new File(name + "_converted_" + suffix + '.' + FORMAT);
+      result = new File(name + '.' + suffix + '.' + FORMAT);
     }
     return result;
   }