gdip-pixbuf-loader r9 - in trunk: . src

[doml svn gnome org]

Author: doml
Date: Mon Feb 18 17:17:25 2008
New Revision: 9
URL: http://svn.gnome.org/viewvc/gdip-pixbuf-loader?rev=9&view=rev

Log:
2008-02-18  Dominic Lachowicz <domlachowicz gmail com>

	* src/io-gdip.c (fill_info): Add support for PNG, GIF, WMF, EMF, TIFF

Modified:
   trunk/ChangeLog
   trunk/src/io-gdip.c

Modified: trunk/src/io-gdip.c
==============================================================================
--- trunk/src/io-gdip.c	(original)
+++ trunk/src/io-gdip.c	Mon Feb 18 17:17:25 2008
@@ -20,7 +20,7 @@
  */
 
 
-#include <io-gdip-utils.h>
+#include "io-gdip-utils.h"
 
 #define GDK_PIXBUF_ENABLE_BACKEND
 #include <gdk-pixbuf/gdk-pixbuf-io.h>
@@ -203,13 +203,36 @@
 fill_info (GdkPixbufFormat *info)
 {
         static GdkPixbufModulePattern signature[] = {
-                { "\xff\xd8", NULL, 100 }, /*JPEG*/
+                { "\xff\xd8", NULL, 100 }, /* JPEG */
+                { "BM", NULL, 100 }, /* BMP */
+                { "GIF8", NULL, 100 }, /* GIF */
+		{ "  \x1   ", "zz znz", 100 }, /* ICO */ 
+		{ "  \x2   ", "zz znz", 100 }, /* ICO */ 
+                { "\x89PNG\r\n\x1a\x0a", NULL, 100 }, /* PNG */
+                { "MM \x2a", "  z ", 100 }, /* TIFF */
+                { "II\x2a ", "   z", 100 }, /* TIFF */
+		{ "\xd7\xcd\xc6\x9a", NULL, 100 }, /* WMF */
+ 		{ "\x01\x00\x09\x00", NULL, 100 }, /* WMF */
+                { "\x01\x00\x00\x00", NULL, 100 }, /* EMF */
                 { NULL, NULL, 0 }
         };
 
         static gchar *mime_types[] = {
                 "image/jpeg",
+		"image/bmp",
+		"image/x-bmp",
+		"image/x-MS-bmp",
+                "image/gif",
+		"image/x-icon",
+		"image/x-ico",
 		"image/png",
+                "image/tiff",
+                "image/x-wmf",
+                "application/emf",
+                "application/x-emf",
+                "image/x-emf",
+                "image/x-mgx-emf",
+                "image/x-xbitmap",
                 NULL
         };
 
@@ -217,7 +240,16 @@
                 "jpeg",
                 "jpe",
                 "jpg",
+                "bmp",
+                "gif",
+		"ico",
+		"cur",                
 		"png",
+		"tiff",
+		"tif",
+ 		"wmf",
+ 		"apm",
+                "emf",
                 NULL
         };
 
@@ -228,5 +260,5 @@
         info->description = "Win32 GDI+ Jpeg, Tiff and Png loader.";
         info->mime_types  = mime_types;
         info->extensions  = extensions;
-        info->flags       = NULL;
+        info->flags       = 0;
 }