From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 26 Sep 2006 12:23:34 +0000 (+0200)
Subject: * let the compiler align several libimages structucters on his own
X-Git-Tag: holmes-import~523
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a319aceec634600d0efa76abf7a233ad8e219ed4;p=libucw.git

* let the compiler align several libimages structucters on his own
* do not assert presence of shepherd's weights in the image indexer
  (should not happen... useful only for debugging)
---

diff --git a/images/signature.h b/images/signature.h
index 791acc68..de6edaaa 100644
--- a/images/signature.h
+++ b/images/signature.h
@@ -28,12 +28,11 @@ 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 */
-  byte reserved[3];
-} PACKED;
+};
 
 #define IMAGE_SIG_TEXTURED	0x1
 
-/* Image signature (16 + len * 16 bytes) */
+/* Image signature (usually 16 + len * 16 bytes) */
 struct image_signature {
   byte len;			/* Number of regions */
   byte flags;			/* IMAGE_SIG_xxx */
@@ -43,19 +42,19 @@ struct image_signature {
   u16 dh;			/* Average weighted h dist */
   struct image_vector vec;	/* Average features of all regions... simple signature */
   struct image_region reg[IMAGE_REG_MAX];/* Feature vector for every region */
-} PACKED;
+};
 
 struct image_cluster {
   union {
     struct {
       s32 dot;			/* Dot product of the splitting plane */
       s8 vec[IMAGE_VEC_F];	/* Normal vector of the splitting plane */
-    } PACKED;
+    };
     struct {
       u64 pos;			/* Cluster size in bytes */
-    } PACKED;
-  } PACKED;
-} PACKED;
+    };
+  };
+};
 
 static inline uns
 image_signature_size(uns len)