diff options
| author | Ignacio Casal Quinteiro <icq@gnome.org> | 2014-09-03 09:48:50 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-10-23 17:04:03 +0200 |
| commit | d846e8e5f532ad823b30b2965f0c8558196d4d40 (patch) | |
| tree | 4db90de10e44acef30a1cef680b5dfca4c617223 /gdk-pixbuf | |
| parent | 3cfe0a9e9a8724eb4358410428d3cf47fc983644 (diff) | |
| download | gdk-pixbuf-d846e8e5f532ad823b30b2965f0c8558196d4d40.tar.gz | |
lib: Prefer our own loaders to the GDI+ one
Give priority to the modules using the open source libraries
instead of gdip as GDI+ is known to be buggy, and not so well integrated
into gdk-pixbuf.
https://bugzilla.gnome.org/show_bug.cgi?id=739077
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 63a029990..dfc2c297e 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -706,6 +706,18 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, try_module (pixdata,pixdata); +#ifdef INCLUDE_gdiplus + try_module (ico,gdip_ico); + try_module (wmf,gdip_wmf); + try_module (emf,gdip_emf); + try_module (bmp,gdip_bmp); + try_module (gif,gdip_gif); + try_module (jpeg,gdip_jpeg); + try_module (tiff,gdip_tiff); +#endif +#ifdef INCLUDE_gdip_png + try_module (png,gdip_png); +#endif #ifdef INCLUDE_png try_module (png,png); #endif @@ -757,18 +769,6 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, #ifdef INCLUDE_qtif try_module (qtif,qtif); #endif -#ifdef INCLUDE_gdiplus - try_module (ico,gdip_ico); - try_module (wmf,gdip_wmf); - try_module (emf,gdip_emf); - try_module (bmp,gdip_bmp); - try_module (gif,gdip_gif); - try_module (jpeg,gdip_jpeg); - try_module (tiff,gdip_tiff); -#endif -#ifdef INCLUDE_gdip_png - try_module (png,gdip_png); -#endif #undef try_module |