From: Pavel Charvat Date: Sat, 16 Sep 2006 14:21:06 +0000 (+0200) Subject: align signature size X-Git-Tag: holmes-import~534 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e84a71ed09f0a2cf91da650b2a85378e8bdf8b8f;p=libucw.git align signature size --- diff --git a/images/signature.h b/images/signature.h index 52d6e2b2..5e3647d1 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 */