[gtk/image-loading: 58/59] contentdeserializer: Use our on jpeg loader
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/image-loading: 58/59] contentdeserializer: Use our on jpeg loader
- Date: Thu, 16 Sep 2021 22:25:38 +0000 (UTC)
commit 18f0c93f974664416dc456ede836823494089382
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Sep 14 17:46:11 2021 -0400
contentdeserializer: Use our on jpeg loader
gdk/gdkcontentserializer.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c
index e0bf34bd53..6faaa0121a 100644
--- a/gdk/gdkcontentserializer.c
+++ b/gdk/gdkcontentserializer.c
@@ -28,6 +28,7 @@
#include "gdkrgba.h"
#include "loaders/gdkpngprivate.h"
#include "loaders/gdktiffprivate.h"
+#include "loaders/gdkjpegprivate.h"
#include "gdkmemorytextureprivate.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -698,6 +699,8 @@ serialize_texture_in_thread (GTask *task,
bytes = gdk_save_png (texture);
else if (strcmp (gdk_content_serializer_get_mime_type (serializer), "image/tiff") == 0)
bytes = gdk_save_tiff (texture);
+ else if (strcmp (gdk_content_serializer_get_mime_type (serializer), "image/jpeg") == 0)
+ bytes = gdk_save_jpeg (texture);
else
g_assert_not_reached ();
@@ -960,6 +963,11 @@ init (void)
texture_serializer,
NULL, NULL);
+ gdk_content_register_serializer (GDK_TYPE_TEXTURE,
+ "image/jpeg",
+ texture_serializer,
+ NULL, NULL);
+
formats = gdk_pixbuf_get_formats ();
/* Make sure png comes first */
@@ -994,9 +1002,10 @@ init (void)
mimes = gdk_pixbuf_format_get_mime_types (fmt);
for (m = mimes; *m; m++)
{
- /* Turning textures into pngs or tiffs is handled above */
+ /* Turning textures into pngs, tiffs or jpegs is handled above */
if (!g_str_equal (name, "png") &&
- !g_str_equal (name, "tiff"))
+ !g_str_equal (name, "tiff") &&
+ !g_str_equal (name, "jpeg"))
gdk_content_register_serializer (GDK_TYPE_TEXTURE,
*m,
pixbuf_serializer,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]