X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fcolor.c;h=0a9da8c4c7f526876cf2db780cced098d03791ef;hb=1cf8ac51f5495ccd5187dc220ffc69e95d6e0cfc;hp=8003c7bed75d8d5106d5d470b5b416db022c6a56;hpb=0a3c6e75d7bf2f7d79a1e448c343946f689e6ba1;p=libucw.git

diff --git a/images/color.c b/images/color.c
index 8003c7be..0a9da8c4 100644
--- a/images/color.c
+++ b/images/color.c
@@ -9,14 +9,14 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "sherlock/math.h"
+#include "ucw/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/error.h"
 #include "images/math.h"
 
 #include <string.h>
+#include <math.h>
 
 uns color_space_channels[COLOR_SPACE_MAX] = {
   [COLOR_SPACE_UNKNOWN] = 0,
@@ -154,7 +154,7 @@ color_put(struct image_context *ctx, struct color *color, byte *dest, uns dest_s
 struct image_conv_options image_conv_defaults = {
   .flags = IMAGE_CONV_COPY_ALPHA | IMAGE_CONV_FILL_ALPHA | IMAGE_CONV_APPLY_ALPHA,
   .background = { .color_space = COLOR_SPACE_GRAYSCALE } };
-  
+
 /* Grayscale <-> RGB */
 
 #define IMAGE_WALK_PREFIX(x) walk_##x
@@ -348,7 +348,7 @@ image_conv_color_space(struct image_context *ctx UNUSED, struct image *dest, str
       case COLOR_SPACE_CMYK:
         switch (src->flags & IMAGE_CHANNELS_FORMAT)
           {
- 	    case COLOR_SPACE_RGB:
+	    case COLOR_SPACE_RGB:
 	      if (dest->pixel_size == 4)
 	        {
 	          image_conv_rgb_n_to_cmyk_4(dest, src);
@@ -1256,18 +1256,19 @@ main(void)
   byte *a = xmalloc(3 * CNT), *b = xmalloc(3 * CNT);
   for (uns i = 0; i < 3 * CNT; i++)
     a[i] = random_max(256);
-  init_timer();
+  timestamp_t timer;
+  init_timer(&timer);
   for (uns i = 0; i < TESTS; i++)
     memcpy(b, a, CNT * 3);
-  DBG("memcpy time=%d", (uns)get_timer());
-  init_timer();
+  DBG("memcpy time=%d", get_timer(&timer));
+  init_timer(&timer);
   for (uns i = 0; i < TESTS; i++)
     srgb_to_luv_pixels(b, a, CNT);
-  DBG("direct time=%d", (uns)get_timer());
-  init_timer();
+  DBG("direct time=%d", get_timer(&timer));
+  init_timer(&timer);
   for (uns i = 0; i < TESTS; i++)
     color_conv_pixels(b, a, CNT, srgb_to_luv_grid);
-  DBG("grid time=%d", (uns)get_timer());
+  DBG("grid time=%d", get_timer(&timer));
 #endif
   return 0;
 }