X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fcolor.c;h=0a9da8c4c7f526876cf2db780cced098d03791ef;hb=1cf8ac51f5495ccd5187dc220ffc69e95d6e0cfc;hp=b5dcaf5f705f8d9c443fefabf36edf601db86cfd;hpb=87b27e3e532a51e97407cd6f54533138d78ebd01;p=libucw.git diff --git a/images/color.c b/images/color.c index b5dcaf5f..0a9da8c4 100644 --- a/images/color.c +++ b/images/color.c @@ -9,14 +9,14 @@ #undef LOCAL_DEBUG -#include "sherlock/sherlock.h" -#include "lib/math.h" +#include "ucw/lib.h" #include "images/images.h" #include "images/color.h" #include "images/error.h" #include "images/math.h" #include +#include 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);