diff options
Diffstat (limited to 'fiv-io.c')
| -rw-r--r-- | fiv-io.c | 350 |
1 files changed, 9 insertions, 341 deletions
@@ -34,11 +34,6 @@ #include <libjpegqs.h> #endif // HAVE_JPEG_QS -// Colour management must be handled before RGB conversions. -#ifdef HAVE_LCMS2 -#include <lcms2.h> -#endif // HAVE_LCMS2 - #define TIFF_TABLES_CONSTANTS_ONLY #include "tiff-tables.h" #include "tiffer.h" @@ -291,333 +286,6 @@ try_append_page( return true; } -// --- Colour management ------------------------------------------------------- - -FivIoProfile -fiv_io_profile_new(const void *data, size_t len) -{ -#ifdef HAVE_LCMS2 - return cmsOpenProfileFromMemTHR(NULL, data, len); -#else - (void) data; - (void) len; - return NULL; -#endif -} - -FivIoProfile -fiv_io_profile_new_sRGB(void) -{ -#ifdef HAVE_LCMS2 - return cmsCreate_sRGBProfileTHR(NULL); -#else - return NULL; -#endif -} - -FivIoProfile -fiv_io_profile_new_parametric( - double gamma, double whitepoint[2], double primaries[6]) -{ -#ifdef HAVE_LCMS2 - // TODO(p): Make sure to use the library in a thread-safe manner. - cmsContext context = NULL; - - const cmsCIExyY cmsWP = {whitepoint[0], whitepoint[1], 1.0}; - const cmsCIExyYTRIPLE cmsP = { - {primaries[0], primaries[1], 1.0}, - {primaries[2], primaries[3], 1.0}, - {primaries[4], primaries[5], 1.0}, - }; - - cmsToneCurve *curve = cmsBuildGamma(context, gamma); - if (!curve) - return NULL; - - cmsHPROFILE profile = cmsCreateRGBProfileTHR( - context, &cmsWP, &cmsP, (cmsToneCurve *[3]){curve, curve, curve}); - cmsFreeToneCurve(curve); - return profile; -#else - (void) gamma; - (void) whitepoint; - (void) primaries; - return NULL; -#endif -} - -FivIoProfile -fiv_io_profile_new_sRGB_gamma(double gamma) -{ - return fiv_io_profile_new_parametric(gamma, - (double[2]){0.3127, 0.3290}, - (double[6]){0.6400, 0.3300, 0.3000, 0.6000, 0.1500, 0.0600}); -} - -static FivIoProfile -fiv_io_profile_new_from_bytes(GBytes *bytes) -{ - gsize len = 0; - gconstpointer p = g_bytes_get_data(bytes, &len); - return fiv_io_profile_new(p, len); -} - -static GBytes * -fiv_io_profile_to_bytes(FivIoProfile profile) -{ -#ifdef HAVE_LCMS2 - cmsUInt32Number len = 0; - (void) cmsSaveProfileToMem(profile, NULL, &len); - gchar *data = g_malloc0(len); - if (!cmsSaveProfileToMem(profile, data, &len)) { - g_free(data); - return NULL; - } - return g_bytes_new_take(data, len); -#else - (void) profile; - return NULL; -#endif -} - -void -fiv_io_profile_free(FivIoProfile self) -{ -#ifdef HAVE_LCMS2 - cmsCloseProfile(self); -#else - (void) self; -#endif -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// TODO(p): In general, try to use CAIRO_FORMAT_RGB30 or CAIRO_FORMAT_RGBA128F. -#ifndef HAVE_LCMS2 -#define FIV_IO_PROFILE_ARGB32 0 -#define FIV_IO_PROFILE_4X16LE 0 -#else -#define FIV_IO_PROFILE_ARGB32 \ - (G_BYTE_ORDER == G_LITTLE_ENDIAN ? TYPE_BGRA_8 : TYPE_ARGB_8) -#define FIV_IO_PROFILE_4X16LE \ - (G_BYTE_ORDER == G_LITTLE_ENDIAN ? TYPE_BGRA_16 : TYPE_BGRA_16_SE) -#endif - -// CAIRO_STRIDE_ALIGNMENT is 4 bytes, so there will be no padding with -// ARGB/BGRA/XRGB/BGRX. -static void -trivial_cmyk_to_host_byte_order_argb(unsigned char *p, int len) -{ - // This CMYK handling has been seen in gdk-pixbuf/JPEG, GIMP/JPEG, skcms. - // It will typically produce horribly oversaturated results. - // Assume that all YCCK/CMYK JPEG files use inverted CMYK, as Photoshop - // does, see https://bugzilla.gnome.org/show_bug.cgi?id=618096 - while (len--) { - int c = p[0], m = p[1], y = p[2], k = p[3]; -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - p[0] = k * y / 255; - p[1] = k * m / 255; - p[2] = k * c / 255; - p[3] = 255; -#else - p[3] = k * y / 255; - p[2] = k * m / 255; - p[1] = k * c / 255; - p[0] = 255; -#endif - p += 4; - } -} - -static void -fiv_io_profile_cmyk( - FivIoImage *image, FivIoProfile source, FivIoProfile target) -{ -#ifndef HAVE_LCMS2 - (void) source; - (void) target; -#else - cmsHTRANSFORM transform = NULL; - if (source && target) { - transform = cmsCreateTransformTHR(NULL, source, TYPE_CMYK_8_REV, target, - FIV_IO_PROFILE_ARGB32, INTENT_PERCEPTUAL, 0); - } - if (transform) { - cmsDoTransform( - transform, image->data, image->data, image->width * image->height); - cmsDeleteTransform(transform); - return; - } -#endif - trivial_cmyk_to_host_byte_order_argb( - image->data, image->width * image->height); -} - -static bool -fiv_io_profile_rgb_direct(unsigned char *data, int w, int h, - FivIoProfile source, FivIoProfile target, - uint32_t source_format, uint32_t target_format) -{ -#ifndef HAVE_LCMS2 - (void) data; - (void) w; - (void) h; - (void) source; - (void) source_format; - (void) target; - (void) target_format; - return false; -#else - // TODO(p): We should make this optional. - cmsHPROFILE src_fallback = NULL; - if (target && !source) - source = src_fallback = cmsCreate_sRGBProfileTHR(NULL); - - cmsHTRANSFORM transform = NULL; - if (source && target) { - transform = cmsCreateTransformTHR(NULL, - source, source_format, target, target_format, INTENT_PERCEPTUAL, 0); - } - if (transform) { - cmsDoTransform(transform, data, data, w * h); - cmsDeleteTransform(transform); - } - if (src_fallback) - cmsCloseProfile(src_fallback); - return transform != NULL; -#endif -} - -static void -fiv_io_profile_xrgb32( - FivIoImage *image, FivIoProfile source, FivIoProfile target) -{ - fiv_io_profile_rgb_direct(image->data, image->width, image->height, - source, target, FIV_IO_PROFILE_ARGB32, FIV_IO_PROFILE_ARGB32); -} - -static void -fiv_io_profile_4x16le_direct( - unsigned char *data, int w, int h, FivIoProfile source, FivIoProfile target) -{ - fiv_io_profile_rgb_direct(data, w, h, source, target, - FIV_IO_PROFILE_4X16LE, FIV_IO_PROFILE_4X16LE); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static void -fiv_io_profile_page(FivIoImage *page, FivIoProfile target, - void (*frame_cb) (FivIoImage *, FivIoProfile, FivIoProfile)) -{ - FivIoProfile source = NULL; - if (page->icc) - source = fiv_io_profile_new_from_bytes(page->icc); - - // TODO(p): All animations need to be composited in a linear colour space. - for (FivIoImage *frame = page; frame != NULL; frame = frame->frame_next) - frame_cb(frame, source, target); - - if (source) - fiv_io_profile_free(source); -} - -static void -fiv_io_premultiply_argb32(FivIoImage *image) -{ - if (image->format != CAIRO_FORMAT_ARGB32) - return; - - for (uint32_t y = 0; y < image->height; y++) { - uint32_t *dstp = (uint32_t *) (image->data + image->stride * y); - for (uint32_t x = 0; x < image->width; x++) { - uint32_t argb = dstp[x], a = argb >> 24; - dstp[x] = a << 24 | - PREMULTIPLY8(a, 0xFF & (argb >> 16)) << 16 | - PREMULTIPLY8(a, 0xFF & (argb >> 8)) << 8 | - PREMULTIPLY8(a, 0xFF & argb); - } - } -} - -#if defined HAVE_LCMS2 && LCMS_VERSION >= 2130 - -#define FIV_IO_PROFILE_ARGB32_PREMUL \ - (G_BYTE_ORDER == G_LITTLE_ENDIAN ? TYPE_BGRA_8_PREMUL : TYPE_ARGB_8_PREMUL) - -static void -fiv_io_profile_argb32(FivIoImage *image, - FivIoProfile source, FivIoProfile target) -{ - g_return_if_fail(image->format == CAIRO_FORMAT_ARGB32); - - fiv_io_profile_rgb_direct(image->data, image->width, image->height, - source, target, - FIV_IO_PROFILE_ARGB32_PREMUL, FIV_IO_PROFILE_ARGB32_PREMUL); -} - -static void -fiv_io_profile_argb32_premultiply( - FivIoImage *image, FivIoProfile source, FivIoProfile target) -{ - if (image->format != CAIRO_FORMAT_ARGB32) { - fiv_io_profile_xrgb32(image, source, target); - } else if (!fiv_io_profile_rgb_direct(image->data, - image->width, image->height, source, target, - FIV_IO_PROFILE_ARGB32, FIV_IO_PROFILE_ARGB32_PREMUL)) { - g_debug("failed to create a premultiplying transform"); - fiv_io_premultiply_argb32(image); - } -} - -#else // ! HAVE_LCMS2 || LCMS_VERSION < 2130 - -// TODO(p): Unpremultiply, transform, repremultiply. Or require lcms2>=2.13. -#define fiv_io_profile_argb32(surface, source, target) - -static void -fiv_io_profile_argb32_premultiply( - FivIoImage *image, FivIoProfile source, FivIoProfile target) -{ - fiv_io_profile_xrgb32(image, source, target); - fiv_io_premultiply_argb32(image); -} - -#endif // ! HAVE_LCMS2 || LCMS_VERSION < 2130 - -#define fiv_io_profile_argb32_premultiply_page(page, target) \ - fiv_io_profile_page((page), (target), fiv_io_profile_argb32_premultiply) - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -static void -fiv_io_profile_any(FivIoImage *image, FivIoProfile source, FivIoProfile target) -{ - // TODO(p): Ensure we do colour management early enough, so that - // no avoidable increase of quantization error occurs beforehands, - // and also for correct alpha compositing. - switch (image->format) { - break; case CAIRO_FORMAT_RGB24: - fiv_io_profile_xrgb32(image, source, target); - break; case CAIRO_FORMAT_ARGB32: - fiv_io_profile_argb32(image, source, target); - break; default: - g_debug("CM attempted on an unsupported surface format"); - } -} - -// TODO(p): Offer better integration, upgrade the bit depth if appropriate. -static FivIoImage * -fiv_io_profile_finalize(FivIoImage *image, FivIoProfile target) -{ - if (!target) - return image; - - for (FivIoImage *page = image; page != NULL; page = page->page_next) - fiv_io_profile_page(page, target, fiv_io_profile_any); - return image; -} - // --- Wuffs ------------------------------------------------------------------- static bool @@ -711,8 +379,8 @@ struct load_wuffs_frame_context { GBytes *meta_iccp; ///< Reference-counted ICC profile GBytes *meta_xmp; ///< Reference-counted XMP - FivIoProfile target; ///< Target device profile, if any - FivIoProfile source; ///< Source colour profile, if any + FivIoProfile *target; ///< Target device profile, if any + FivIoProfile *source; ///< Source colour profile, if any FivIoImage *result; ///< The resulting image (referenced) FivIoImage *result_tail; ///< The final animation frame @@ -1390,7 +1058,7 @@ parse_exif_profile_subifd( } } -static FivIoProfile +static FivIoProfile * parse_exif_profile(const void *data, size_t len) { struct tiffer T = {}; @@ -1586,7 +1254,7 @@ load_jpeg_finalize(FivIoImage *image, bool cmyk, else g_byte_array_free(meta.icc, TRUE); - FivIoProfile source = NULL; + FivIoProfile *source = NULL; if (icc_profile) source = fiv_io_profile_new( g_bytes_get_data(icc_profile, NULL), g_bytes_get_size(icc_profile)); @@ -2403,7 +2071,7 @@ load_resvg_destroy(FivIoRenderClosure *closure) static FivIoImage * load_resvg_render_internal(FivIoRenderClosureResvg *self, - double scale, FivIoProfile target, GError **error) + double scale, FivIoProfile *target, GError **error) { double w = ceil(self->width * scale), h = ceil(self->height * scale); if (w > SHRT_MAX || h > SHRT_MAX) { @@ -2438,7 +2106,7 @@ load_resvg_render_internal(FivIoRenderClosureResvg *self, static FivIoImage * load_resvg_render( - FivIoRenderClosure *closure, FivIoProfile target, double scale) + FivIoRenderClosure *closure, FivIoProfile *target, double scale) { FivIoRenderClosureResvg *self = (FivIoRenderClosureResvg *) closure; return load_resvg_render_internal(self, scale, target, NULL); @@ -2530,7 +2198,7 @@ load_librsvg_destroy(FivIoRenderClosure *closure) static FivIoImage * load_librsvg_render_internal(FivIoRenderClosureLibrsvg *self, double scale, - FivIoProfile target, GError **error) + FivIoProfile *target, GError **error) { RsvgRectangle viewport = {.x = 0, .y = 0, .width = self->width * scale, .height = self->height * scale}; @@ -2562,7 +2230,7 @@ load_librsvg_render_internal(FivIoRenderClosureLibrsvg *self, double scale, static FivIoImage * load_librsvg_render( - FivIoRenderClosure *closure, FivIoProfile target, double scale) + FivIoRenderClosure *closure, FivIoProfile *target, double scale) { FivIoRenderClosureLibrsvg *self = (FivIoRenderClosureLibrsvg *) closure; return load_librsvg_render_internal(self, scale, target, NULL); @@ -3712,7 +3380,7 @@ set_metadata(WebPMux *mux, const char *fourcc, GBytes *data) } gboolean -fiv_io_save(FivIoImage *page, FivIoImage *frame, FivIoProfile target, +fiv_io_save(FivIoImage *page, FivIoImage *frame, FivIoProfile *target, const char *path, GError **error) { g_return_val_if_fail(page != NULL, FALSE); |