X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fconfig.c;h=c3a5855e71ec73a0b452cc7ec9b645c83e9f7b87;hb=d5fdccbecd2acde9a6e067b54fcd69b02f31a820;hp=931cc1992f42c844b44a31f9f8e7e0fd35f6812d;hpb=d558e5450310239fee2667bc3d528bb87ccf1d63;p=libucw.git

diff --git a/images/config.c b/images/config.c
index 931cc199..c3a5855e 100644
--- a/images/config.c
+++ b/images/config.c
@@ -6,23 +6,47 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
+#include "ucw/lib.h"
+#include "ucw/conf.h"
 #include "images/images.h"
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
 #include "images/signature.h"
+#endif
 
 #include <string.h>
 
+/* ImageLib section */
+uns image_trace;
+uns image_max_dim = 0xffff;
+uns image_max_bytes = ~0U;
+
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+/* ImageSig section */
 uns image_sig_min_width;
 uns image_sig_min_height;
 uns *image_sig_prequant_thresholds;
 uns image_sig_postquant_min_steps;
 uns image_sig_postquant_max_steps;
 uns image_sig_postquant_threshold;
+double image_sig_border_size;
+int image_sig_border_bonus;
+double image_sig_inertia_scale[3];
 double image_sig_textured_threshold;
-uns image_sig_compare_method;
+int image_sig_compare_method;
+uns image_sig_cmp_features_weights[IMAGE_REG_F + IMAGE_REG_H];
+#endif
+
+static struct cf_section image_lib_config = {
+  CF_ITEMS{
+    CF_UNS("Trace", &image_trace),
+    CF_UNS("ImageMaxDim", &image_max_dim),
+    CF_UNS("ImageMaxBytes", &image_max_bytes),
+    CF_END
+  }
+};
 
-static struct cf_section sig_config = {
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+static struct cf_section image_sig_config = {
   CF_ITEMS{
     CF_UNS("MinWidth", &image_sig_min_width),
     CF_UNS("MinHeight", &image_sig_min_height),
@@ -30,14 +54,22 @@ static struct cf_section sig_config = {
     CF_UNS("PostQuantMinSteps", &image_sig_postquant_min_steps),
     CF_UNS("PostQuantMaxSteps", &image_sig_postquant_max_steps),
     CF_UNS("PostQuantThreshold", &image_sig_postquant_threshold),
+    CF_DOUBLE("BorderSize", &image_sig_border_size),
+    CF_INT("BorderBonus", &image_sig_border_bonus),
+    CF_DOUBLE_ARY("InertiaScale", image_sig_inertia_scale, 3),
     CF_DOUBLE("TexturedThreshold", &image_sig_textured_threshold),
-    CF_UNS("CompareMethod", &image_sig_compare_method),
+    CF_LOOKUP("CompareMethod", &image_sig_compare_method, ((const char * const []){"integrated", "fuzzy", "average", NULL})),
+    CF_UNS_ARY("CompareFeaturesWeights", image_sig_cmp_features_weights, IMAGE_REG_F + IMAGE_REG_H),
     CF_END
   }
 };
+#endif
 
 static void CONSTRUCTOR
 images_init_config(void)
 {
-  cf_declare_section("ImageSig", &sig_config, 0);
+  cf_declare_section("ImageLib", &image_lib_config, 0);
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+  cf_declare_section("ImageSig", &image_sig_config, 0);
+#endif
 }