diff --git a/gdk/gdkmemoryformat.c b/gdk/gdkmemoryformat.c index 02b2e4e52b..8af756ea4b 100644 --- a/gdk/gdkmemoryformat.c +++ b/gdk/gdkmemoryformat.c @@ -1951,6 +1951,149 @@ gdk_memory_convert (guchar *dest_data, g_free (tmp); } +static const guchar srgb_lookup[] = { + 0, 12, 21, 28, 33, 38, 42, 46, 49, 52, 55, 58, 61, 63, 66, 68, + 70, 73, 75, 77, 79, 81, 82, 84, 86, 88, 89, 91, 93, 94, 96, 97, + 99, 100, 102, 103, 104, 106, 107, 109, 110, 111, 112, 114, 115, 116, 117, 118, + 120, 121, 122, 123, 124, 125, 126, 127, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 151, 152, 153, 154, 155, 156, 157, 157, 158, 159, 160, 161, 161, 162, 163, 164, + 165, 165, 166, 167, 168, 168, 169, 170, 171, 171, 172, 173, 174, 174, 175, 176, + 176, 177, 178, 179, 179, 180, 181, 181, 182, 183, 183, 184, 185, 185, 186, 187, + 187, 188, 189, 189, 190, 191, 191, 192, 193, 193, 194, 194, 195, 196, 196, 197, + 197, 198, 199, 199, 200, 201, 201, 202, 202, 203, 204, 204, 205, 205, 206, 206, + 207, 208, 208, 209, 209, 210, 210, 211, 212, 212, 213, 213, 214, 214, 215, 215, + 216, 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, 222, 223, 223, 224, + 224, 225, 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 231, 232, 232, + 233, 233, 234, 234, 235, 235, 236, 236, 237, 237, 237, 238, 238, 239, 239, 240, + 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 245, 246, 246, 247, 247, + 248, 248, 249, 249, 250, 250, 251, 251, 251, 252, 252, 253, 253, 254, 254, 255 +}; + +static const guchar srgb_inverse_lookup[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, + 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, + 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, + 13, 13, 13, 14, 14, 15, 15, 16, 16, 16, 17, 17, 18, 18, 19, 19, + 20, 20, 21, 22, 22, 23, 23, 24, 24, 25, 26, 26, 27, 27, 28, 29, + 29, 30, 31, 31, 32, 33, 33, 34, 35, 36, 36, 37, 38, 38, 39, 40, + 41, 42, 42, 43, 44, 45, 46, 47, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 80, 81, 82, 83, 84, 85, 87, 88, + 89, 90, 92, 93, 94, 95, 97, 98, 99, 101, 102, 103, 105, 106, 107, 109, + 110, 112, 113, 114, 116, 117, 119, 120, 122, 123, 125, 126, 128, 129, 131, 132, + 134, 135, 137, 139, 140, 142, 144, 145, 147, 148, 150, 152, 153, 155, 157, 159, + 160, 162, 164, 166, 167, 169, 171, 173, 175, 176, 178, 180, 182, 184, 186, 188, + 190, 192, 193, 195, 197, 199, 201, 203, 205, 207, 209, 211, 213, 215, 218, 220, + 222, 224, 226, 228, 230, 232, 235, 237, 239, 241, 243, 245, 248, 250, 252, 255 +}; + +static void +convert_srgb_to_srgb_linear (guchar *data, + gsize n) +{ + for (gsize i = 0; i < n; i++) + { + guint16 r = data[0]; + guint16 g = data[1]; + guint16 b = data[2]; + guchar a = data[3]; + + if (a != 0) + { + r = (r * 255 + a / 2) / a; + g = (g * 255 + a / 2) / a; + b = (b * 255 + a / 2) / a; + + r = srgb_inverse_lookup[r]; + g = srgb_inverse_lookup[g]; + b = srgb_inverse_lookup[b]; + + r = r * a + 127; + g = g * a + 127; + b = b * a + 127; + data[0] = (r + (r >> 8) + 1) >> 8; + data[1] = (g + (g >> 8) + 1) >> 8; + data[2] = (b + (b >> 8) + 1) >> 8; + } + data += 4; + } +} + +static void +convert_srgb_linear_to_srgb (guchar *data, + gsize n) +{ + for (gsize i = 0; i < n; i++) + { + guint16 r = data[0]; + guint16 g = data[1]; + guint16 b = data[2]; + guchar a = data[3]; + + if (a != 0) + { + r = (r * 255 + a / 2) / a; + g = (g * 255 + a / 2) / a; + b = (b * 255 + a / 2) / a; + + r = srgb_lookup[r]; + g = srgb_lookup[g]; + b = srgb_lookup[b]; + + r = r * a + 127; + g = g * a + 127; + b = b * a + 127; + data[0] = (r + (r >> 8) + 1) >> 8; + data[1] = (g + (g >> 8) + 1) >> 8; + data[2] = (b + (b >> 8) + 1) >> 8; + } + + data += 4; + } +} + +static void +convert_srgb_to_srgb_linear_in_place (guchar *data, + gsize stride, + gsize width, + gsize height) +{ + if (stride == width * 4) + { + convert_srgb_to_srgb_linear (data, height * width); + } + else + { + for (gsize y = 0; y < height; y++) + { + convert_srgb_to_srgb_linear (data, width); + data += stride; + } + } +} + +static void +convert_srgb_linear_to_srgb_in_place (guchar *data, + gsize stride, + gsize width, + gsize height) +{ + if (stride == width * 4) + { + convert_srgb_linear_to_srgb (data, height * width); + } + else + { + for (gsize y = 0; y < height; y++) + { + convert_srgb_linear_to_srgb (data, width); + data += stride; + } + } +} + void gdk_memory_convert_color_state (guchar *data, gsize stride, @@ -1967,6 +2110,21 @@ gdk_memory_convert_color_state (guchar *data, if (gdk_color_state_equal (src_cs, dest_cs)) return; + if (format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED && + src_cs == GDK_COLOR_STATE_SRGB && + dest_cs == GDK_COLOR_STATE_SRGB_LINEAR) + { + convert_srgb_to_srgb_linear_in_place (data, stride, width, height); + return; + } + else if (format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED && + src_cs == GDK_COLOR_STATE_SRGB_LINEAR && + dest_cs == GDK_COLOR_STATE_SRGB) + { + convert_srgb_linear_to_srgb_in_place (data, stride, width, height); + return; + } + convert_func = gdk_color_state_get_convert_to (src_cs, dest_cs); /* FIXME: add fallback that goes via generic colorstate */ g_assert (convert_func);