X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fconfig.c;h=f249cf843748ac9b0b25064ff98687ed957ee273;hb=6de1e8ff2085b921dfd2dd05ab4a6bdb22ed3048;hp=8c07f2d8ed55c5192d092e4cc61d08b4609fe6fc;hpb=90db56027f9378a0e78effedb0b15a5ba4444e3f;p=libucw.git diff --git a/images/config.c b/images/config.c index 8c07f2d8..f249cf84 100644 --- a/images/config.c +++ b/images/config.c @@ -6,11 +6,12 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/conf.h" -#include "images/images.h" +#include +#include +#include +#include #if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP) -#include "images/signature.h" +#include #endif #include @@ -58,7 +59,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 }