X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fcolor.h;h=3a2c165443e24d17aad03eac9b8538fa4833f502;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=8c87e87c5414500d89a77bdb603e9a21dd5943c3;hpb=452c9a553643dd995d125f9913db3b839a8ca642;p=libucw.git

diff --git a/images/color.h b/images/color.h
index 8c87e87c..3a2c1654 100644
--- a/images/color.h
+++ b/images/color.h
@@ -25,21 +25,111 @@
 #ifndef _IMAGES_COLOR_H
 #define _IMAGES_COLOR_H
 
-#include "images/images.h"
-
-// A comparison of four multimedia RGB spaces, Danny Pascale
+#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_UNKNOWN = 0,
+  COLOR_SPACE_UNKNOWN_1 = 1,	/* unknown 1-channel color space */
+  COLOR_SPACE_UNKNOWN_2 = 2,	/* unknown 2-channels color space */
+  COLOR_SPACE_UNKNOWN_3 = 3,	/* unknown 3-channels color space */
+  COLOR_SPACE_UNKNOWN_4 = 4,	/* unknown 4-channels color space */
+  COLOR_SPACE_UNKNOWN_MAX = 4,
   COLOR_SPACE_GRAYSCALE,
   COLOR_SPACE_RGB,
   COLOR_SPACE_XYZ,
   COLOR_SPACE_LAB,
   COLOR_SPACE_LUV,
   COLOR_SPACE_YCBCR,
+  COLOR_SPACE_CMYK,
+  COLOR_SPACE_YCCK,
   COLOR_SPACE_MAX
 };
 
+extern uns 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);
+
+/* 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);
+
+static inline void color_make_gray(struct color *color, uns 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)
+{
+  color->c[0] = r;
+  color->c[1] = g;
+  color->c[2] = b;
+  color->color_space = COLOR_SPACE_RGB;
+}
+
+extern struct color color_black, color_white;
+
+/* Conversion between various pixel formats */
+
+enum {
+  IMAGE_CONV_FILL_ALPHA = 1,
+  IMAGE_CONV_COPY_ALPHA = 2,
+  IMAGE_CONV_APPLY_ALPHA = 4,
+};
+
+struct image_conv_options {
+  uns flags;
+  struct color background;
+};
+
+extern struct image_conv_options image_conv_defaults;
+
+int image_conv(struct image_context *ctx, struct image *dest, struct image *src, struct image_conv_options *opt);
+
 /* Color spaces in the CIE 1931 chromacity diagram */
 
 struct color_space_chromacity_info {
@@ -81,39 +171,18 @@ void color_compute_bradford_matrix(double matrix[9], const double src[2], const
 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 uns rgb_to_gray_func(uns r, uns g, uns b)
 {
   return (r * 19660 + g * 38666 + b * 7210) >> 16;
 }
 
-extern struct color color_black, color_white;
-
-static inline void
-color_make_gray(struct color *color, uns 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)
-{
-  color->c[0] = r;
-  color->c[1] = g;
-  color->c[2] = b;
-  color->color_space = COLOR_SPACE_RGB;
-}
-
-void color_put_color_space(byte *dest, struct color *color, uns color_space);
-void color_put_grayscale(byte *dest, struct color *color);
-void color_put_rgb(byte *dest, struct color *color);
-
 /* Exact slow conversion routines */
 void srgb_to_xyz_exact(double dest[3], double src[3]);
 void xyz_to_srgb_exact(double dest[3], double src[3]);
 void xyz_to_luv_exact(double dest[3], double src[3]);
 void luv_to_xyz_exact(double dest[3], double src[3]);
+void rgb_to_cmyk_exact(double dest[4], double src[3]);
+void cmyk_to_rgb_exact(double dest[3], double src[4]);
 
 /* Reference white */
 #define REF_WHITE_X 0.96422
@@ -148,8 +217,7 @@ void srgb_to_luv_init(void);
 void srgb_to_luv_pixels(byte *dest, byte *src, uns 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]];
@@ -204,8 +272,7 @@ void color_conv_pixels(byte *dest, byte *src, uns count, struct color_grid_node
 
 #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;