small fixes

diff --git a/cf/images b/cf/images
index 9e5339853b009c6d524c078ac501c57326071b94..9d767e6f7421e7a9ca0a83d6a09d09029e617f6b 100644 (file)
--- a/cf/images
+++ b/cf/images
@@ -12,7 +12,7 @@ ImageSig {
 MinWidth       16
 MinHeight      16
 
-PreQuantThresholds     9 100 400 1000 2000 2000 4000 4000 4000 8000 8000 8000 10000 10000 10000
+PreQuantThresholds     9 100 400 1000 2000 2000 2000 4000 4000 4000 4000 8000 8000 8000 8000
 PostQuantMinSteps      2
 PostQuantMaxSteps      10
 PostQuantThreshold     2

diff --git a/images/sig-init.c b/images/sig-init.c
index 6c5e75e5bac98635f623b498fd2533f340f391de..a5f738a0537feec37999c89abd1491a7f20c8186 100644 (file)
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -158,9 +158,9 @@ image_sig_preprocess(struct image_sig_data *data)
          block->v[3] = fast_sqrt_u16(isqr(t[8]) + isqr(t[9]) + isqr(t[12]) + isqr(t[13]));
          block->v[4] = fast_sqrt_u16(isqr(t[2]) + isqr(t[3]) + isqr(t[6]) + isqr(t[7]));
          block->v[5] = fast_sqrt_u16(isqr(t[10]) + isqr(t[11]) + isqr(t[14]) + isqr(t[15]));
-         sum[3] += block->v[3] * block->area / 2;
-         sum[4] += block->v[4] * block->area / 2;
-         sum[5] += block->v[5] * block->area / 2;
+         sum[3] += block->v[3] * block->area;
+         sum[4] += block->v[4] * block->area;
+         sum[5] += block->v[5] * block->area;
         }
     }
 

diff --git a/images/sig-txt.c b/images/sig-txt.c
index 3673c118703a6223107e4f41622880afbbd4df31..4a79438d482f096f5a53f82fd582e49ee0c137ff 100644 (file)
--- a/images/sig-txt.c
+++ b/images/sig-txt.c
@@ -24,8 +24,8 @@ image_sig_detect_textured(struct image_sig_data *data)
 {
   uns cols = data->cols;
   uns rows = data->rows;
-  uns cell_cols = MIN(cols, MAX_CELLS_COLS);
-  uns cell_rows = MIN(rows, MAX_CELLS_ROWS);
+  uns cell_cols = MIN((cols + 1) / 2, MAX_CELLS_COLS);
+  uns cell_rows = MIN((rows + 1) / 2, MAX_CELLS_ROWS);
   uns cell_x[MAX_CELLS_COLS + 1];
   uns cell_y[MAX_CELLS_ROWS + 1];
   uns i, j;