MergeImages: Added several config options.

[libucw.git] / images / config.c

diff --git a/images/config.c b/images/config.c
index 658d9fb100ad899810db5acbc6173527ff426170..4494348b303f2b7e9532b91246d8246fb22cc017 100644 (file)
--- a/images/config.c
+++ b/images/config.c
@@ -9,7 +9,7 @@
 #include "lib/lib.h"
 #include "lib/conf.h"
 #include "images/images.h"
-#ifndef CONFIG_FREE
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
 #include "images/signature.h"
 #endif
 
@@ -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, ((char *[]){"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
 }