reverted invalid usage of GET*/PUT* macros

[libucw.git] / images / signature.h

diff --git a/images/signature.h b/images/signature.h
index 3511f914fbb728a2856562c9ab8c09ed8d3240af..e84c7f3164fbb01784fb9c527af634756f39b2d7 100644 (file)
--- a/images/signature.h
+++ b/images/signature.h
@@ -5,6 +5,8 @@
 extern uns image_sig_min_width, image_sig_min_height;
 extern uns *image_sig_prequant_thresholds;
 extern uns image_sig_postquant_min_steps, image_sig_postquant_max_steps, image_sig_postquant_threshold;
+extern double image_sig_textured_threshold;
+extern uns image_sig_compare_method;
 
 #define IMAGE_VEC_F    6
 #define IMAGE_REG_F    IMAGE_VEC_F
@@ -24,19 +26,34 @@ struct image_region {
   u16 wb;                      /* normalized weight */
 } PACKED;
 
-/* Image signature (10 + len * 16 bytes) */
+#define IMAGE_SIG_TEXTURED     0x1
+
+/* Image signature (11 + len * 16 bytes) */
 struct image_signature {
   byte len;                    /* Number of regions */
-  byte df;                     /* average f dist */
-  u16 dh;                      /* average h dist */
+  byte flags;                  /* IMAGE_SIG_xxx */
+  byte df;                     /* Average f dist */
+  u16 dh;                      /* Average h dist */
   struct image_vector vec;     /* Combination 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)
 {
-  return 4 + sizeof(struct image_vector) + len * sizeof(struct image_region);
+  return 5 + sizeof(struct image_vector) + len * sizeof(struct image_region);
 }
 
 /* sig-dump.c */
@@ -48,10 +65,11 @@ byte *image_vector_dump(byte *buf, struct image_vector *vec);
 byte *image_region_dump(byte *buf, struct image_region *reg);
 
 struct image_sig_block {
-  struct image_sig_block *next;
-  u32 area;             /* block area in pixels (usually 16) */
-  u32 v[IMAGE_VEC_F];
-  u32 x, y;             /* block position */
+  struct image_sig_block *next;                /* linked list */
+  u32 x, y;                            /* block position */
+  byte area;                           /* block area in pixels (usually 16) */
+  byte region;                         /* region index */
+  byte v[IMAGE_VEC_F];                 /* feature vector */
 };
 
 struct image_sig_region {
@@ -72,6 +90,7 @@ struct image_sig_data {
   u32 rows;
   u32 full_cols;
   u32 full_rows;
+  u32 flags;
   u32 area;
   u32 valid;
   u32 blocks_count;
@@ -92,46 +111,14 @@ void image_sig_cleanup(struct image_sig_data *data);
 
 void image_sig_segmentation(struct image_sig_data *data);
 
-/* sig-cmp.c */
-
-#define IMAGE_SIG_DIST_SCALE (3 + 3 + 8 + 16)
-
-uns image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2);
-
-#if 0
-/* K-dimensional interval */
-struct image_bbox {
-  struct image_vector vec[2];
-};
-
-/* Similarity search tree... will be changed */
-struct image_tree {
-  uns count;                   /* Number of images in the tree */
-  uns depth;                   /* Tree depth */
-  struct image_bbox bbox;      /* Bounding box containing all the */
-  struct image_node *nodes;    /* Internal nodes */
-  struct image_leaf *leaves;   /* Leaves */
-};
+/* sig-txt.c */
 
-/* Internal node in the search tree */
-#define IMAGE_NODE_LEAF                0x80000000              /* Node contains pointer to leaves array */
-#define IMAGE_NODE_DIM         0xff                    /* Split dimension */
-struct image_node {
-  u32 val;
-};
+void image_sig_detect_textured(struct image_sig_data *data);
 
-/* Leaves in the search tree */
-#define IMAGE_LEAF_LAST                0x80000000              /* Last entry in the list */
-#define IMAGE_LEAF_BITS(i)     (31 / IMAGE_VEC_K)      /* Number of bits for relative position in i-th dimension */
-struct image_leaf {
-  u32 flags;           /* Relative position in bbox and last node flag */ 
-  oid_t oid;
-};
+/* sig-cmp.c */
 
-#define stk_print_image_vector(v) ({ struct image_vector *_v = v; \
-    byte *_s = (byte *) alloca(IMAGE_VEC_K * 6), *_p = _s + sprintf(_s, "%d", _v->f[0]); \
-    for (uns _i = 1; _i < IMAGE_VEC_K; _i++) _p += sprintf(_p, " %d", _v->f[_i]); _s; })
-#endif
+uns image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2);
+uns image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param);
 
 #endif