X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fimage-test.c;h=1e49d284dd1b66d68044aff9bcf397bc9de9b440;hb=94022b1a1e317871b302946b595b2e890f4f1853;hp=9ff9df9e5b190af2fb646b0b479247685c14b223;hpb=6e052a5a07718b9f0ff417b27adf8b8ed8903f36;p=libucw.git

diff --git a/images/image-test.c b/images/image-test.c
index 9ff9df9e..1e49d284 100644
--- a/images/image-test.c
+++ b/images/image-test.c
@@ -1,121 +1,81 @@
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "lib/fastbuf.h"
-#include "images/images.h"
-#include "images/image-sig.h"
-#include "images/kd-tree.h"
-#include "sherlock/index.h"
+#include "lib/lib.h"
 #include "lib/mempool.h"
-#include "sherlock/object.h"
-#include "sherlock/lizard-fb.h"
-#include <fcntl.h>
-#include <stdio.h>
-
-#include "sherlock/sherlock.h"
-#include "lib/fastbuf.h"
 #include "images/images.h"
-#include "sherlock/index.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <alloca.h>
+#include <string.h>
 
-#define BEST_CNT 30
-
-struct image_tree image_tree;
+static uns want_image_iface;
 
 static void
-image_tree_init(void)
+test_image_iface(void)
 {
-  DBG("Initializing image search structures");
-  struct fastbuf *fb = bopen("index/image-tree", O_RDONLY, 1 << 16); /* FIXME: filename hack */
-  image_tree.count = bgetl(fb);
-  image_tree.depth = bgetl(fb);
-  ASSERT(image_tree.count < 0x80000000 && image_tree.depth > 0 && image_tree.depth < 30);
-  image_tree.nodes = xmalloc((1 << image_tree.depth) * sizeof(struct image_node));
-  image_tree.leaves = xmalloc(image_tree.count * sizeof(struct image_leaf));
-  bread(fb, &image_tree.bbox, sizeof(struct image_bbox));
-  bread(fb, image_tree.nodes + 1, ((1 << image_tree.depth) - 1) * sizeof(struct image_node));
-  bread(fb, image_tree.leaves, image_tree.count * sizeof(struct image_leaf));
-  DBG("Search tree with depth %d and %d leaves loaded", image_tree.depth, image_tree.count);
-  bclose(fb);
-}
+  struct mempool *pool;
+  struct image_thread it;
+  struct image *i1, *i2;
+  struct image s1;
+  int i;
 
-static void
-image_tree_done(void)
-{
-  DBG("Freeing image search structures");
-  xfree(image_tree.nodes);
-  xfree(image_tree.leaves);
+  pool = mp_new(1024);
+  image_thread_init(&it);
+
+  i1 = image_new(&it, 731, 327, COLOR_SPACE_RGB, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 3);
+  image_destroy(i1);
+
+  i1 = image_new(&it, 2214, 0, COLOR_SPACE_RGB, NULL);
+  ASSERT(!i1);
+
+  i1 = image_new(&it, 0xffffff, 0xffffff, COLOR_SPACE_RGB, NULL);
+  ASSERT(!i1);
+
+  i1 = image_new(&it, 370, 100, COLOR_SPACE_GRAYSCALE, pool);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 1);
+  image_destroy(i1);
+  mp_flush(pool);
+
+  i1 = image_new(&it, 373, 101, COLOR_SPACE_RGB | IMAGE_ALIGNED, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 4);
+  ASSERT(IMAGE_SSE_ALIGN_SIZE >= 16);
+  ASSERT(!(i1->row_size & (IMAGE_SSE_ALIGN_SIZE - 1)));
+  ASSERT(!((addr_int_t)i1->pixels & (IMAGE_SSE_ALIGN_SIZE - 1)));
+  image_destroy(i1);
+
+  i1 = image_new(&it, 283, 329, COLOR_SPACE_RGB, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 3);
+
+  i2 = image_clone(&it, i1, COLOR_SPACE_RGB, NULL);
+  ASSERT(i2);
+  ASSERT(i2->pixel_size == 3);
+  image_destroy(i2);
+
+  i2 = image_clone(&it, i1, COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED, NULL);
+  ASSERT(i2);
+  ASSERT(i2->pixel_size == 4);
+  image_destroy(i2);
+
+  i = image_init_subimage(&it, &s1, i1, 29, 39, 283 - 29, 100);
+  ASSERT(i);
+  image_destroy(&s1);
+
+  image_destroy(i1);
+
+  image_thread_cleanup(&it);
+  mp_delete(pool);
 }
-  
+
 int
 main(int argc, char **argv)
 {
-  struct image_vector query;
-  if (argc != IMAGE_VEC_K + 1)
-    die("Invalid number of arguments");
-
-  for (uns i = 0; i < IMAGE_VEC_K; i++)
-    {
-      uns v;
-      if (sscanf(argv[i + 1], "%d", &v) != 1)
-	die("Invalid numeric format");
-      query.f[i] = v;
-    }
-  
-  
-  struct image_search is;
-  oid_t best[BEST_CNT];
-  uns dist[BEST_CNT];
-  uns cardpos[BEST_CNT];
-  uns best_n = 0;
-  
-  image_tree_init();
-  log(L_INFO, "Executing query (%s)", stk_print_image_vector(&query));
-  image_search_init(&is, &image_tree, &query, IMAGE_SEARCH_DIST_UNLIMITED);
-  for (uns i = 0; i < BEST_CNT; i++)
-    {
-      if (!image_search_next(&is, best + i, dist + i))
-        {
-          log(L_INFO, "No more images");
-          break;
-        }
-      DBG("*** Found %d. best image with oid=%d", i + 1, best[i]);
-      best_n++;
-    }
-  image_search_done(&is);
-  image_tree_done();
-
-  log(L_INFO, "Resolving URLs");
-  struct mempool *pool = mp_new(1 << 16);
-  struct buck2obj_buf *bob = buck2obj_alloc();
-  struct fastbuf *fb = bopen("index/card-attrs", O_RDONLY, 1 << 10);
-  for (uns i = 0; i < best_n; i++)
-    {
-      bsetpos(fb, best[i] * sizeof(struct card_attr));
-      struct card_attr ca;
-      bread(fb, &ca, sizeof(ca));
-      cardpos[i] = ca.card;
-    }
-  bclose(fb);
-  fb = bopen("index/cards", O_RDONLY, 1 << 14);
-  for (uns i = 0; i < best_n; i++)
-    {
-      bsetpos(fb, (sh_off_t)cardpos[i] << CARD_POS_SHIFT);
-      uns buck_len = bgetl(fb) - (LIZARD_COMPRESS_HEADER - 1);
-      uns buck_type = bgetc(fb) + BUCKET_TYPE_PLAIN;
-      mp_flush(pool);
-      struct odes *obj = obj_read_bucket(bob, pool, buck_type, buck_len, fb, NULL);
-
-      printf("%2d. match: dist=%-8d oid=%-8d url=%s\n", i + 1, dist[i], best[i],
-	  obj_find_aval(obj_find_attr(obj, 'U' + OBJ_ATTR_SON)->son, 'U'));
-    }
-  bclose(fb);
-  buck2obj_free(bob);
-  mp_delete(pool);
-     
+  for (int i = 0; i < argc; i++)
+    if (!strcmp(argv[i], "image-iface"))
+      want_image_iface = 1;
+  if (want_image_iface)
+    test_image_iface();
   return 0;
 }