dt += image_sig_cmp_features_weights[i] * isqr((int)reg1->f[i] - (int)reg2->f[i]);
for (uns i = 0; i < 3; i++)
ds += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
- for (uns i = 3; i < 4; i++)
+ for (uns i = 3; i < 5; i++)
dp += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
#if 0
int x1, y1, x2, y2;
d = dt;
if (ds < 1000)
d = d * 4;
- else if (ds < 3000)
+ else if (ds < 4000)
d = d * 6 + 8;
else if (ds < 10000)
d = d * 8 + 20;
q[i] = reg2->wb;
/* Sort entries in distance matrix */
- image_signatures_dist_integrated_sort(n, dist);
+ image_signatures_dist_integrated_sort(dist, n);
/* Compute significance matrix and resulting distance */
uns sum = 0;
uns dist = 0;
for (uns i = 0; i < IMAGE_VEC_F; i++)
{
- uns d = image_sig_cmp_features_weights[0] * isqr((int)sig1->vec.f[i] - (int)sig2->vec.f[i]);
+ uns d = image_sig_cmp_features_weights[0] * isqr((int)sig1->vec.f[i] - (int)sig2->vec.f[i]);
MSGL("feature %u: d=%u (%u %u)", i, d, sig1->vec.f[i], sig2->vec.f[i]);
dist += d;
}