Conf: Rewritten configuration parser to support multiple contexts (step 1)

[libucw.git] / images / config.c

diff --git a/images/config.c b/images/config.c
index 4494348b303f2b7e9532b91246d8246fb22cc017..cce37c012a90889e74651aa49c1080cd731c3e01 100644 (file)
--- 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"
+#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"
+#include <images/signature.h>
 #endif
 
 #include <string.h>
@@ -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, ((char *[]){"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
   }