p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default to gdk-pixbuf even for Wuffs formats

This commit is contained in:
Přemysl Eric Janouch 2022-01-22 20:38:49 +01:00
parent 686d45553b
commit 8877e17108
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fiv-io.c
View File

@ -2517,22 +2517,26 @@ fiv_io_open_from_data(const char *data, size_t len, const gchar *uri,
g_clear_error(error); g_clear_error(error);
} }
#endif // HAVE_LIBTIFF -------------------------------------------------------- #endif // HAVE_LIBTIFF --------------------------------------------------------
#ifdef HAVE_GDKPIXBUF // ------------------------------------------------------
// This is only used as a last resort, the rest above is special-cased.
if ((surface = open_gdkpixbuf(data, len, profile, error)))
break;
if (error && (*error)->code != GDK_PIXBUF_ERROR_UNKNOWN_TYPE)
break;
if (error) {
g_debug("%s", (*error)->message);
g_clear_error(error);
}
#endif // HAVE_GDKPIXBUF ------------------------------------------------------
set_error(error, "unsupported file type"); set_error(error, "unsupported file type");
} }
#ifdef HAVE_GDKPIXBUF // ------------------------------------------------------
// This is used as a last resort, the rest above is special-cased.
// Wuffs #71 and similar concerns make us default to it in all cases.
if (!surface) {
GError *err = NULL;
if ((surface = open_gdkpixbuf(data, len, profile, &err))) {
g_clear_error(error);
} else if (err->code == GDK_PIXBUF_ERROR_UNKNOWN_TYPE) {
g_error_free(err);
} else {
g_clear_error(error);
g_propagate_error(error, err);
}
}
#endif // HAVE_GDKPIXBUF ------------------------------------------------------
// gdk-pixbuf only gives out this single field--cater to its limitations, // gdk-pixbuf only gives out this single field--cater to its limitations,
// since we'd really like to have it. // since we'd really like to have it.
// TODO(p): The Exif orientation should be ignored in JPEG-XL at minimum. // TODO(p): The Exif orientation should be ignored in JPEG-XL at minimum.