AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 23:00:08 +00:00
Code Issues Projects Releases Wiki Activity

jpeg: Load grayscale as-is

Browse Source 
We can handle grayscale textures just fine nowadays, so no need to
convert them to RGB.
This commit is contained in:
Matthias Clasen 2024-07-27 19:19:11 -04:00
parent 3149493679
commit a5aac30843
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gdk/loaders/gdkjpeg.c
View File

@ -78,31 +78,6 @@ output_message_handler (j_common_ptr cinfo)
/* }}} */
/* {{{ Format conversion */
static void
convert_grayscale_to_rgb (guchar *data,
int width,
int height,
int stride)
{
gsize x, y;
guchar *dest, *src;
for (y = 0; y < height; y++)
{
src = data + width;
dest = data + 3 * width;
for (x = 0; x < width; x++)
{
dest -= 3;
src -= 1;
dest[0] = *src;
dest[1] = *src;
dest[2] = *src;
}
data += stride;
}
}
static void
convert_cmyk_to_rgba (guchar *data,
int width,
@ -184,6 +159,10 @@ gdk_load_jpeg (GBytes *input_bytes,
switch ((int)info.out_color_space)
{
case JCS_GRAYSCALE:
stride = width;
data = g_try_malloc_n (stride, height);
format = GDK_MEMORY_G8;
break;
case JCS_RGB:
stride = 3 * width;
data = g_try_malloc_n (stride, height);
@ -217,20 +196,8 @@ gdk_load_jpeg (GBytes *input_bytes,
jpeg_read_scanlines (&info, row, 1);
}
switch ((int)info.out_color_space)
{
case JCS_GRAYSCALE:
convert_grayscale_to_rgb (data, width, height, stride);
format = GDK_MEMORY_R8G8B8;
break;
case JCS_RGB:
break;
case JCS_CMYK:
convert_cmyk_to_rgba (data, width, height, stride);
break;
default:
g_assert_not_reached ();
}
if (info.out_color_space == JCS_CMYK)
convert_cmyk_to_rgba (data, width, height, stride);
jpeg_finish_decompress (&info);
jpeg_destroy_decompress (&info);