XML: Small bugfix in xml_merge_chars.

[libucw.git] / images / image-test.c

diff --git a/images/image-test.c b/images/image-test.c
index b046672f9e1959aec7a3eb3df05a07d6ac0b54fd..889e85e5270958edd87fc114b22e8e635dddba56 100644 (file)
--- a/images/image-test.c
+++ b/images/image-test.c
@@ -12,6 +12,7 @@
 #include "lib/lib.h"
 #include "lib/mempool.h"
 #include "lib/fastbuf.h"
+#include "lib/threads.h"
 #include "images/images.h"
 #include "images/color.h"
 
@@ -63,7 +64,7 @@ test_image_iface(void)
   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)));
+  ASSERT(!((uintptr_t)i1->pixels & (IMAGE_SSE_ALIGN_SIZE - 1)));
   image_destroy(i1);
 
   i1 = image_new(&ctx, 283, 329, COLOR_SPACE_RGB, NULL);
@@ -92,6 +93,8 @@ test_image_iface(void)
   mp_delete(pool);
 }
 
+#ifdef CONFIG_UCW_THREADS
+
 #define TEST_THREADS_COUNT 4
 
 static void *
@@ -186,13 +189,16 @@ test_threads_thread(void *param UNUSED)
   return NULL;
 }
 
+#endif
+
 static void
 test_threads(void)
 {
+#ifdef CONFIG_UCW_THREADS
   pthread_t threads[TEST_THREADS_COUNT - 1];
   pthread_attr_t attr;
   if (pthread_attr_init(&attr) < 0 ||
-      pthread_attr_setstacksize(&attr, 1 << 20) < 0)
+      pthread_attr_setstacksize(&attr, default_thread_stack_size) < 0)
     ASSERT(0);
   for (uns i = 0; i < TEST_THREADS_COUNT - 1; i++)
     {
@@ -203,6 +209,9 @@ test_threads(void)
   for (uns i = 0; i < TEST_THREADS_COUNT - 1; i++)
     if (pthread_join(threads[i], NULL) < 0)
       die("Cannot join thread: %m");
+#else
+  msg(L_WARN, "Disabled CONFIG_UCW_THREADS, threaded tests skipped");
+#endif
 }
 
 int