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

diff --git a/images/config.c b/images/config.c
index a268525e..c3a5855e 100644
--- a/images/config.c
+++ b/images/config.c
@@ -6,10 +6,12 @@
 
 #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>
 
@@ -18,6 +20,7 @@ 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;
@@ -31,6 +34,7 @@ double image_sig_inertia_scale[3];
 double image_sig_textured_threshold;
 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{
@@ -41,6 +45,7 @@ static struct cf_section image_lib_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),
@@ -53,15 +58,18 @@ static struct cf_section image_sig_config = {
     CF_INT("BorderBonus", &image_sig_border_bonus),
     CF_DOUBLE_ARY("InertiaScale", image_sig_inertia_scale, 3),
     CF_DOUBLE("TexturedThreshold", &image_sig_textured_threshold),
-    CF_LOOKUP("CompareMethod", &image_sig_compare_method, ((byte *[]){"integrated", "fuzzy", "average", NULL})),
+    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("ImageLib", &image_lib_config, 0);
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
   cf_declare_section("ImageSig", &image_sig_config, 0);
+#endif
 }