#ifndef _IMAGES_COLOR_H
#define _IMAGES_COLOR_H
-#include "images/images.h"
+#include <images/images.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cmyk_to_rgb_exact ucw_cmyk_to_rgb_exact
+#define color_adobe_rgb_info ucw_color_adobe_rgb_info
+#define color_apple_rgb_info ucw_color_apple_rgb_info
+#define color_black ucw_color_black
+#define color_cie_rgb_info ucw_color_cie_rgb_info
+#define color_color_match_rgb_info ucw_color_color_match_rgb_info
+#define color_compute_bradford_matrix ucw_color_compute_bradford_matrix
+#define color_compute_color_space_to_xyz_matrix ucw_color_compute_color_space_to_xyz_matrix
+#define color_compute_color_spaces_conversion_matrix ucw_color_compute_color_spaces_conversion_matrix
+#define color_conv_init ucw_color_conv_init
+#define color_conv_pixels ucw_color_conv_pixels
+#define color_get ucw_color_get
+#define color_illuminant_d50 ucw_color_illuminant_d50
+#define color_illuminant_d65 ucw_color_illuminant_d65
+#define color_illuminant_e ucw_color_illuminant_e
+#define color_interpolation_table ucw_color_interpolation_table
+#define color_invert_matrix ucw_color_invert_matrix
+#define color_put ucw_color_put
+#define color_space_channels ucw_color_space_channels
+#define color_space_id_to_name ucw_color_space_id_to_name
+#define color_space_name ucw_color_space_name
+#define color_space_name_to_id ucw_color_space_name_to_id
+#define color_srgb_info ucw_color_srgb_info
+#define color_white ucw_color_white
+#define image_conv ucw_image_conv
+#define image_conv_defaults ucw_image_conv_defaults
+#define luv_to_xyz_exact ucw_luv_to_xyz_exact
+#define rgb_to_cmyk_exact ucw_rgb_to_cmyk_exact
+#define srgb_to_luv_grid ucw_srgb_to_luv_grid
+#define srgb_to_luv_init ucw_srgb_to_luv_init
+#define srgb_to_luv_pixels ucw_srgb_to_luv_pixels
+#define srgb_to_luv_tab1 ucw_srgb_to_luv_tab1
+#define srgb_to_luv_tab2 ucw_srgb_to_luv_tab2
+#define srgb_to_luv_tab3 ucw_srgb_to_luv_tab3
+#define srgb_to_xyz_exact ucw_srgb_to_xyz_exact
+#define xyz_to_luv_exact ucw_xyz_to_luv_exact
+#define xyz_to_srgb_exact ucw_xyz_to_srgb_exact
+#endif
/* Basic color spaces */
enum {
COLOR_SPACE_MAX
};
-extern uns color_space_channels[COLOR_SPACE_MAX];
+extern uint color_space_channels[COLOR_SPACE_MAX];
extern byte *color_space_name[COLOR_SPACE_MAX];
/* Color space ID <-> name conversions */
-byte *color_space_id_to_name(uns id);
-uns color_space_name_to_id(byte *name);
+byte *color_space_id_to_name(uint id);
+uint color_space_name_to_id(byte *name);
/* Struct color manipulation */
-int color_get(struct color *color, byte *src, uns src_space);
-int color_put(struct image_context *ctx, struct color *color, byte *dest, uns dest_space);
+int color_get(struct color *color, byte *src, uint src_space);
+int color_put(struct image_context *ctx, struct color *color, byte *dest, uint dest_space);
-static inline void
-color_make_gray(struct color *color, uns gray)
+static inline void color_make_gray(struct color *color, uint gray)
{
color->c[0] = gray;
color->color_space = COLOR_SPACE_GRAYSCALE;
}
-static inline void
-color_make_rgb(struct color *color, uns r, uns g, uns b)
+static inline void color_make_rgb(struct color *color, uint r, uint g, uint b)
{
color->c[0] = r;
color->c[1] = g;
};
struct image_conv_options {
- uns flags;
+ uint flags;
struct color background;
};
void color_compute_color_spaces_conversion_matrix(double matrix[9], const struct color_space_chromacity_info *src, const struct color_space_chromacity_info *dest);
void color_invert_matrix(double dest[9], double matrix[9]);
-static inline uns
-rgb_to_gray_func(uns r, uns g, uns b)
+static inline uint rgb_to_gray_func(uint r, uint g, uint b)
{
return (r * 19660 + g * 38666 + b * 7210) >> 16;
}
extern u32 srgb_to_luv_tab3[20 << SRGB_TO_LUV_TAB3_SIZE];
void srgb_to_luv_init(void);
-void srgb_to_luv_pixels(byte *dest, byte *src, uns count);
+void srgb_to_luv_pixels(byte *dest, byte *src, uint count);
/* L covers the interval [0..255]; u and v are centered to 128 and scaled by 1/4 in respect of L */
-static inline void
-srgb_to_luv_pixel(byte *dest, byte *src)
+static inline void srgb_to_luv_pixel(byte *dest, byte *src)
{
- uns r = srgb_to_luv_tab1[src[0]];
- uns g = srgb_to_luv_tab1[src[1]];
- uns b = srgb_to_luv_tab1[src[2]];
- uns x =
- (uns)(4 * SRGB_XYZ_XR * 0xffff) * r +
- (uns)(4 * SRGB_XYZ_XG * 0xffff) * g +
- (uns)(4 * SRGB_XYZ_XB * 0xffff) * b;
- uns y =
- (uns)(9 * SRGB_XYZ_YR * 0xffff) * r +
- (uns)(9 * SRGB_XYZ_YG * 0xffff) * g +
- (uns)(9 * SRGB_XYZ_YB * 0xffff) * b;
- uns l = srgb_to_luv_tab2[y >> (28 - SRGB_TO_LUV_TAB2_SIZE)];
+ uint r = srgb_to_luv_tab1[src[0]];
+ uint g = srgb_to_luv_tab1[src[1]];
+ uint b = srgb_to_luv_tab1[src[2]];
+ uint x =
+ (uint)(4 * SRGB_XYZ_XR * 0xffff) * r +
+ (uint)(4 * SRGB_XYZ_XG * 0xffff) * g +
+ (uint)(4 * SRGB_XYZ_XB * 0xffff) * b;
+ uint y =
+ (uint)(9 * SRGB_XYZ_YR * 0xffff) * r +
+ (uint)(9 * SRGB_XYZ_YG * 0xffff) * g +
+ (uint)(9 * SRGB_XYZ_YB * 0xffff) * b;
+ uint l = srgb_to_luv_tab2[y >> (28 - SRGB_TO_LUV_TAB2_SIZE)];
dest[0] = l >> (SRGB_TO_LUV_TAB2_SCALE - 8);
- uns sum =
- (uns)((SRGB_XYZ_XR + 15 * SRGB_XYZ_YR + 3 * SRGB_XYZ_ZR) * 0x7fff) * r +
- (uns)((SRGB_XYZ_XG + 15 * SRGB_XYZ_YG + 3 * SRGB_XYZ_ZG) * 0x7fff) * g +
- (uns)((SRGB_XYZ_XB + 15 * SRGB_XYZ_YB + 3 * SRGB_XYZ_ZB) * 0x7fff) * b;
- uns s = srgb_to_luv_tab3[sum >> (27 - SRGB_TO_LUV_TAB3_SIZE)];
+ uint sum =
+ (uint)((SRGB_XYZ_XR + 15 * SRGB_XYZ_YR + 3 * SRGB_XYZ_ZR) * 0x7fff) * r +
+ (uint)((SRGB_XYZ_XG + 15 * SRGB_XYZ_YG + 3 * SRGB_XYZ_ZG) * 0x7fff) * g +
+ (uint)((SRGB_XYZ_XB + 15 * SRGB_XYZ_YB + 3 * SRGB_XYZ_ZB) * 0x7fff) * b;
+ uint s = srgb_to_luv_tab3[sum >> (27 - SRGB_TO_LUV_TAB3_SIZE)];
int xs = ((u64)x * s) >> 32;
int ys = ((u64)y * s) >> 32;
int xw = ((4 * 13) << (SRGB_TO_LUV_TAB3_SCALE - 4)) *
extern struct color_interpolation_node *color_interpolation_table;
void color_conv_init(void);
-void color_conv_pixels(byte *dest, byte *src, uns count, struct color_grid_node *grid);
+void color_conv_pixels(byte *dest, byte *src, uint count, struct color_grid_node *grid);
#define COLOR_CONV_SCALE_CONST (((((1 << COLOR_CONV_SIZE) - 1) << 16) + (1 << (16 - COLOR_CONV_OFS))) / 255)
-static inline void
-color_conv_pixel(byte *dest, byte *src, struct color_grid_node *grid)
+static inline void color_conv_pixel(byte *dest, byte *src, struct color_grid_node *grid)
{
- uns s0 = src[0] * COLOR_CONV_SCALE_CONST;
- uns s1 = src[1] * COLOR_CONV_SCALE_CONST;
- uns s2 = src[2] * COLOR_CONV_SCALE_CONST;
+ uint s0 = src[0] * COLOR_CONV_SCALE_CONST;
+ uint s1 = src[1] * COLOR_CONV_SCALE_CONST;
+ uint s2 = src[2] * COLOR_CONV_SCALE_CONST;
struct color_grid_node *g0, *g1, *g2, *g3, *g = grid +
((s0 >> 16) + ((s1 >> 16) << COLOR_CONV_SIZE) + ((s2 >> 16) << (2 * COLOR_CONV_SIZE)));
struct color_interpolation_node *n = color_interpolation_table +
projects / libucw.git / blobdiff