#undef LOCAL_DEBUG
-#include "sherlock/sherlock.h"
-#include "lib/math.h"
-#include "lib/fastbuf.h"
-#include "lib/conf.h"
-#include "images/math.h"
-#include "images/images.h"
-#include "images/color.h"
-#include "images/signature.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/conf.h>
+#include <images/images.h>
+#include <images/math.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/signature.h>
#include <alloca.h>
+#include <math.h>
int
-image_sig_init(struct image_thread *thread, struct image_sig_data *data, struct image *image)
+image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image)
{
ASSERT((image->flags & IMAGE_PIXEL_FORMAT) == COLOR_SPACE_RGB);
data->image = image;
data->blocks_count = data->cols * data->rows;
if (data->blocks_count >= 0x10000)
{
- image_thread_err(thread, IMAGE_ERR_INVALID_DIMENSIONS, "Image too large for implemented signature algorithm.");
+ IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Image too large for implemented signature algorithm.");
return 0;
}
data->blocks = xmalloc(data->blocks_count * sizeof(struct image_sig_block));
}
for (; x < 4; x++)
{
- *tp = tp[-square_cols];
+ *tp = tp[-(int)square_cols];
tp++;
}
}
for (; y < 4; y++)
for (x = 0; x < 4; x++)
{
- *tp = tp[-square_rows * 4];
+ *tp = tp[-(int)square_rows * 4];
tp++;
}
block->area = square_cols * square_rows;
data->valid = 1;
}
-static double image_sig_inertia_scale[3] = { 3, 1, 0.3 };
-
void
image_sig_finish(struct image_sig_data *data, struct image_signature *sig)
{
sig->flags = data->flags;
if (!sig->len)
return;
-
+
/* For each region */
u64 w_total = 0;
uns w_border = MIN(data->cols, data->rows) * image_sig_border_size;
sig->reg[i].f[5] = r->a[5];
/* Compute coordinates centroid and region weight */
- u64 x_avg = 0, y_avg = 0, w_sum = 0;
+ u64 x_sum = 0, y_sum = 0, w_sum = 0;
for (struct image_sig_block *b = r->blocks; b; b = b->next)
{
- x_avg += b->x;
- y_avg += b->y;
+ x_sum += b->x;
+ y_sum += b->y;
uns d = b->x;
d = MIN(d, b->y);
d = MIN(d, data->cols - b->x - 1);
}
w_total += w_sum;
r->w_sum = w_sum;
- x_avg /= r->count;
- y_avg /= r->count;
- DBG(" centroid=(%u %u)", (uns)x_avg, (uns)y_avg);
+ uns x_avg = x_sum / r->count;
+ uns y_avg = y_sum / r->count;
+ DBG(" centroid=(%u %u)", x_avg, y_avg);
/* Compute normalized inertia */
u64 sum1 = 0, sum2 = 0, sum3 = 0;
for (struct image_sig_block *b = r->blocks; b; b = b->next)
{
uns inc2 = isqr(x_avg - b->x) + isqr(y_avg - b->y);
- uns inc1 = sqrt(inc2);
+ uns inc1 = fast_sqrt_u32(inc2);
sum1 += inc1;
sum2 += inc2;
sum3 += inc1 * inc2;
}
- sig->reg[i].h[0] = CLAMP(image_sig_inertia_scale[0] * sum1 * ((3 * M_PI * M_PI) / 2) * pow(r->count, -1.5), 0, 65535);
- sig->reg[i].h[1] = CLAMP(image_sig_inertia_scale[1] * sum2 * ((4 * M_PI * M_PI * M_PI) / 2) / ((u64)r->count * r->count), 0, 65535);
- sig->reg[i].h[2] = CLAMP(image_sig_inertia_scale[2] * sum3 * ((5 * M_PI * M_PI * M_PI * M_PI) / 2) * pow(r->count, -2.5), 0, 65535);
-
+ sig->reg[i].h[0] = CLAMP(image_sig_inertia_scale[0] * sum1 * ((3 * M_PI * M_PI) / 2) * pow(r->count, -1.5), 0, 255);
+ sig->reg[i].h[1] = CLAMP(image_sig_inertia_scale[1] * sum2 * ((4 * M_PI * M_PI * M_PI) / 2) / ((u64)r->count * r->count), 0, 255);
+ sig->reg[i].h[2] = CLAMP(image_sig_inertia_scale[2] * sum3 * ((5 * M_PI * M_PI * M_PI * M_PI) / 2) * pow(r->count, -2.5), 0, 255);
+ sig->reg[i].h[3] = (uns)x_avg * 127 / data->cols;
+ sig->reg[i].h[4] = (uns)y_avg * 127 / data->rows;
}
/* Compute average differences */
{
uns d = 0;
for (uns k = 0; k < IMAGE_REG_F; k++)
- d += isqr(sig->reg[i].f[k] - sig->reg[j].f[k]);
- df += sqrt(d);
+ d += image_sig_cmp_features_weights[k] * isqr(sig->reg[i].f[k] - sig->reg[j].f[k]);
+ df += fast_sqrt_u32(d);
d = 0;
for (uns k = 0; k < IMAGE_REG_H; k++)
- d += isqr(sig->reg[i].h[k] - sig->reg[j].h[k]);
- dh += sqrt(d);
+ d += image_sig_cmp_features_weights[k + IMAGE_REG_F] * isqr(sig->reg[i].h[k] - sig->reg[j].h[k]);
+ dh += fast_sqrt_u32(d);
cnt++;
}
- sig->df = CLAMP(df / cnt, 1, 255);
- sig->dh = CLAMP(dh / cnt, 1, 65535);
+ sig->df = CLAMP(df / cnt, 1, 0xffff);
+ sig->dh = CLAMP(dh / cnt, 1, 0xffff);
}
DBG("Average regions difs: df=%u dh=%u", sig->df, sig->dh);
sig->reg[0].wa = wa;
sig->reg[0].wb = wb;
+ /* Store image dimensions */
+ sig->cols = data->image->cols;
+ sig->rows = data->image->rows;
+
/* Dump regions features */
#ifdef LOCAL_DEBUG
for (uns i = 0; i < sig->len; i++)
}
int
-compute_image_signature(struct image_thread *thread, struct image_signature *sig, struct image *image)
+compute_image_signature(struct image_context *ctx, struct image_signature *sig, struct image *image)
{
struct image_sig_data data;
- if (!image_sig_init(thread, &data, image))
+ if (!image_sig_init(ctx, &data, image))
return 0;
image_sig_preprocess(&data);
if (data.valid)