X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fsignature.h;h=791acc6819ef78a49aa4f40157c31888b5dbeb01;hb=d46d9596c225dbbcaef4b76e0828036e3addfbe3;hp=52d6e2b2f1629db48b5141cb7b3093032d2a0064;hpb=c90e99fab0aeb3fd8b6b79665721611d199e1f78;p=libucw.git

diff --git a/images/signature.h b/images/signature.h
index 52d6e2b2..791acc68 100644
--- a/images/signature.h
+++ b/images/signature.h
@@ -28,17 +28,17 @@ struct image_region {
   byte h[IMAGE_REG_H];		/* shape/pos features - I1, I2, I3, X, Y */
   byte wa;			/* normalized area percentage */
   byte wb;			/* normalized weight */
-  u16 reserved;
+  byte reserved[3];
 } PACKED;
 
 #define IMAGE_SIG_TEXTURED	0x1
 
-/* Image signature (11 + len * 16 bytes) */
+/* Image signature (16 + len * 16 bytes) */
 struct image_signature {
   byte len;			/* Number of regions */
   byte flags;			/* IMAGE_SIG_xxx */
-  u32 cols;			/* Image width */
-  u32 rows;			/* Image height */
+  u16 cols;			/* Image width */
+  u16 rows;			/* Image height */
   u16 df;			/* Average weighted f dist */
   u16 dh;			/* Average weighted h dist */
   struct image_vector vec;	/* Average features of all regions... simple signature */
@@ -107,9 +107,9 @@ struct image_sig_data {
 
 /* sig-init.c */
 
-int compute_image_signature(struct image_thread *thread, struct image_signature *sig, struct image *image);
+int compute_image_signature(struct image_context *ctx, struct image_signature *sig, struct image *image);
 
-int image_sig_init(struct image_thread *thread, struct image_sig_data *data, struct image *image);
+int image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image);
 void image_sig_preprocess(struct image_sig_data *data);
 void image_sig_finish(struct image_sig_data *data, struct image_signature *sig);
 void image_sig_cleanup(struct image_sig_data *data);