X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=images%2Fconfig.c;h=cce37c012a90889e74651aa49c1080cd731c3e01;hb=eec6d2c37cbcbf9c350aa4ca80e5a316e5144087;hp=4494348b303f2b7e9532b91246d8246fb22cc017;hpb=aafbea40b7613274180c8bab60012a0322f8d7dd;p=libucw.git diff --git a/images/config.c b/images/config.c index 4494348b..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" +#include +#include +#include #if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP) -#include "images/signature.h" +#include #endif #include @@ -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 }