X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fconfig.c;h=cce37c012a90889e74651aa49c1080cd731c3e01;hb=eec6d2c37cbcbf9c350aa4ca80e5a316e5144087;hp=658d9fb100ad899810db5acbc6173527ff426170;hpb=9656a16dfe13dd25c0d66b684b6ddfa18881b4bb;p=libucw.git

diff --git a/images/config.c b/images/config.c
index 658d9fb1..cce37c01 100644
--- a/images/config.c
+++ b/images/config.c
@@ -6,11 +6,11 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "images/images.h"
-#ifndef CONFIG_FREE
-#include "images/signature.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>
@@ -20,7 +20,7 @@ uns image_trace;
 uns image_max_dim = 0xffff;
 uns image_max_bytes = ~0U;
 
-#ifndef CONFIG_FREE
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
 /* ImageSig section */
 uns image_sig_min_width;
 uns image_sig_min_height;
@@ -45,7 +45,7 @@ static struct cf_section image_lib_config = {
   }
 };
 
-#ifndef CONFIG_FREE
+#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),
@@ -58,7 +58,7 @@ 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
   }
@@ -69,7 +69,7 @@ static void CONSTRUCTOR
 images_init_config(void)
 {
   cf_declare_section("ImageLib", &image_lib_config, 0);
-#ifndef CONFIG_FREE
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
   cf_declare_section("ImageSig", &image_sig_config, 0);
 #endif
 }