neat symbolic threshold 0.92

Author: zvezdochiot

README.md

@@ -25,13 +25,13 @@ See the `jbig2enc.h` header for the high level API, or the `jbig2` program for a
 example of usage:
 
 ```
-$ jbig2 -s -p -v *.jpg && python3 jbig2topdf.py output >out.pdf
+$ jbig2 -s -a -p -v *.jpg && python3 jbig2topdf.py output >out.pdf
 ```
 
 or with standalone mode:
 
 ```
-$ jbig2 -p -v images/feyn.tif > feyn.jbig2 && python3 jbig2topdf.py -s feyn.jbig2 > feyn.pdf
+$ jbig2 -a -p -v images/feyn.tif > feyn.jbig2 && python3 jbig2topdf.py -s feyn.jbig2 > feyn.pdf
 ```
 
 to encode jbig2 files for pdf creation.

src/jbig2.cc

@@ -49,7 +49,7 @@ usage(const char *argv0) {
   fprintf(stderr, "  -d --duplicate-line-removal: use TPGD in generic region coder\n");
   fprintf(stderr, "  -p --pdf: produce PDF ready data\n");
   fprintf(stderr, "  -s --symbol-mode: use text region, not generic coder\n");
-  fprintf(stderr, "  -t <threshold>: set classification threshold for symbol coder (def: 0.85)\n");
+  fprintf(stderr, "  -t <threshold>: set classification threshold for symbol coder (def: 0.92)\n");
   fprintf(stderr, "  -T <bw threshold>: set 1 bpp threshold (def: 188)\n");
   fprintf(stderr, "  -r --refine: use refinement (requires -s: lossless)\n");
   fprintf(stderr, "  -O <outfile>: dump thresholded image as PNG\n");
@@ -202,7 +202,7 @@ int
 main(int argc, char **argv) {
   bool duplicate_line_removal = false;
   bool pdfmode = false;
-  float threshold = 0.85;
+  float threshold = 0.92;
   int bw_threshold = 188;
   bool symbol_mode = false;
   bool refine = false;
@@ -308,9 +308,9 @@ main(int argc, char **argv) {
         return 1;
       }
 
-      if (threshold > 0.9 || threshold < 0.4) {
+      if (threshold > 0.97 || threshold < 0.4) {
         fprintf(stderr, "Invalid value for threshold\n");
-        fprintf(stderr, "(must be between 0.4 and 0.9)\n");
+        fprintf(stderr, "(must be between 0.4 and 0.97)\n");
         return 10;
       }
       i++;

src/jbig2comparator.cc

@@ -200,7 +200,7 @@ jbig2enc_are_equivalent(PIX *const first_template, PIX *const second_template) {
           horizontal_sum += horizontal_parsed_pix_counts[i+x][j+y];
         }
       }
-      if (horizontal_sum > hline_thresh) {
+      if (horizontal_sum >= hline_thresh) {
         return 0;
       }
     }
@@ -215,7 +215,7 @@ jbig2enc_are_equivalent(PIX *const first_template, PIX *const second_template) {
         vertical_sum += vertical_parsed_pix_counts[i+x][j+y];
         }
       }
-      if (vertical_sum > vline_thresh) {
+      if (vertical_sum >= vline_thresh) {
         return 0;
       }
     }
@@ -236,7 +236,7 @@ jbig2enc_are_equivalent(PIX *const first_template, PIX *const second_template) {
           }
         }
       }
-      if ((left_cross > hline_thresh) || (right_cross > hline_thresh)) {
+      if ((left_cross >= hline_thresh) || (right_cross >= hline_thresh)) {
         return 0;
       }
     }
@@ -253,7 +253,7 @@ jbig2enc_are_equivalent(PIX *const first_template, PIX *const second_template) {
           sum += parsed_pix_counts[i+x][j+y];
         }
       }
-      if (sum > point_thresh) {
+      if (sum >= point_thresh) {
         return 0;
       }
     }