aboutsummaryrefslogtreecommitdiff
path: root/fiv-view.c
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2024-01-26 21:58:18 +0100
committerPřemysl Eric Janouch <p@janouch.name>2024-01-28 01:48:28 +0100
commit604594a8f1d048b516120ba98eba71302e2043b4 (patch)
tree22e2923cadd1413503d1527bb10efbaaf1c09d81 /fiv-view.c
parent9acab00bcc53d3adc52f1681d733e57dcb3c3f0d (diff)
downloadfiv-604594a8f1d048b516120ba98eba71302e2043b4.tar.gz
fiv-604594a8f1d048b516120ba98eba71302e2043b4.tar.xz
fiv-604594a8f1d048b516120ba98eba71302e2043b4.zip
Prepare for parallelized colour management
This rewrite is more or less necessary for: - colour-managed browser thumbnails, - asynchronous image loading, - turning fiv-io into a reusable library. Little CMS has a fairly terrible API in this regard.
Diffstat (limited to 'fiv-view.c')
-rw-r--r--fiv-view.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fiv-view.c b/fiv-view.c
index 0025d47..fbcb769 100644
--- a/fiv-view.c
+++ b/fiv-view.c
@@ -417,6 +417,7 @@ prescale_page(FivView *self)
// If it fails, the previous frame pointer may become invalid.
g_clear_pointer(&self->page_scaled, fiv_io_image_unref);
self->frame = self->page_scaled = closure->render(closure,
+ self->enable_cms ? fiv_io_cmm_get_default() : NULL,
self->enable_cms ? self->screen_cms_profile : NULL, self->scale);
if (!self->page_scaled)
self->frame = self->page;
@@ -475,7 +476,8 @@ monitor_cms_profile(GdkWindow *root, int num)
if (gdk_property_get(root, gdk_atom_intern(atom, FALSE), GDK_NONE, 0,
8 << 20 /* MiB */, FALSE, &type, &format, &length, &data)) {
if (format == 8 && length > 0)
- result = fiv_io_profile_new(data, length);
+ result = fiv_io_cmm_get_profile(
+ fiv_io_cmm_get_default(), data, length);
g_free(data);
}
return result;
@@ -525,7 +527,8 @@ reload_screen_cms_profile(FivView *self, GdkWindow *window)
out:
if (!self->screen_cms_profile)
- self->screen_cms_profile = fiv_io_profile_new_sRGB();
+ self->screen_cms_profile =
+ fiv_io_cmm_get_profile_sRGB(fiv_io_cmm_get_default());
}
static void
@@ -1381,6 +1384,7 @@ open_without_swapping_in(FivView *self, const char *uri)
{
FivIoOpenContext ctx = {
.uri = uri,
+ .cmm = self->enable_cms ? fiv_io_cmm_get_default() : NULL,
.screen_profile = self->enable_cms ? self->screen_cms_profile : NULL,
.screen_dpi = 96, // TODO(p): Try to retrieve it from the screen.
.enhance = self->enhance,