Opt: Cleaned up opt-conf

[libucw.git] / images / sig-txt.c

diff --git a/images/sig-txt.c b/images/sig-txt.c
index 4a79438d482f096f5a53f82fd582e49ee0c137ff..d4ea597c4259fba43eabee96ec8b0875e4e227b3 100644 (file)
--- a/images/sig-txt.c
+++ b/images/sig-txt.c
@@ -7,12 +7,12 @@
  *     of the GNU Lesser General Public License.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "images/images.h"
-#include "images/signature.h"
-#include "images/math.h"
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/signature.h>
+#include <images/math.h>
 
 #include <string.h>
 
@@ -22,6 +22,12 @@
 void
 image_sig_detect_textured(struct image_sig_data *data)
 {
+  if (image_sig_textured_threshold <= 0)
+    {
+      DBG("Zero textured threshold.");
+      return;
+    }
+
   uns cols = data->cols;
   uns rows = data->rows;
   uns cell_cols = MIN((cols + 1) / 2, MAX_CELLS_COLS);
@@ -31,8 +37,14 @@ image_sig_detect_textured(struct image_sig_data *data)
   uns i, j;
   u32 cnt[IMAGE_REG_MAX];
 
+  if (cell_cols * cell_rows < 4)
+    {
+      DBG("Image is not textured.");
+      return;
+    }
+
   DBG("Detecting textured image... cols=%u rows=%u cell_cols=%u cell_rows=%u", cols, rows, cell_cols, cell_rows);
-  
+
   /* Compute cells boundaries */
   for (i = 1, j = 0; i < cell_cols; i++)
     cell_x[i] = fast_div_u32_u8(j += cols, cell_cols);
@@ -47,7 +59,7 @@ image_sig_detect_textured(struct image_sig_data *data)
   for (uns i = 0; i < data->regions_count; i++)
     for (struct image_sig_block *block = data->regions[i].blocks; block; block = block->next)
       block->region = i;
-  
+
   /* Process cells */
   double e = 0;
   for (uns j = 0; j < cell_rows; j++)
@@ -55,7 +67,7 @@ image_sig_detect_textured(struct image_sig_data *data)
       {
        uns cell_area = 0;
         bzero(cnt, data->regions_count * sizeof(u32));
-       struct image_sig_block *b1 = data->blocks + cell_x[i] + cell_y[i] * cols, *b2;
+       struct image_sig_block *b1 = data->blocks + cell_x[i] + cell_y[j] * cols, *b2;
         for (uns y = cell_y[j]; y < cell_y[j + 1]; y++, b1 += cols)
          {
            b2 = b1;
@@ -67,7 +79,7 @@ image_sig_detect_textured(struct image_sig_data *data)
          }
        for (uns k = 0; k < data->regions_count; k++)
          {
-           int a = data->blocks_count * cnt[k] - cell_area * data->regions[k].count; 
+           int a = data->blocks_count * cnt[k] - cell_area * data->regions[k].count;
            e += (double)a * a / ((double)isqr(data->regions[k].count) * cell_area);
          }
       }
@@ -75,7 +87,7 @@ image_sig_detect_textured(struct image_sig_data *data)
   DBG("Coefficient=%g", (double)e / (data->regions_count * data->blocks_count));
 
   /* Threshold */
-  if (e <= image_sig_textured_threshold * data->regions_count * data->blocks_count)
+  if (e < image_sig_textured_threshold * data->regions_count * data->blocks_count)
     {
       data->flags |= IMAGE_SIG_TEXTURED;
       DBG("Image is textured.");