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

[tml svn gnome org]

Author: tml
Date: Mon Mar 17 00:01:08 2008
New Revision: 48
URL: http://svn.gnome.org/viewvc/gdip-pixbuf-loader?rev=48&view=rev

Log:
2008-03-17  Tor Lillqvist  <tml novell com>

	* src/io-gdip-utils.h (MODULE_ENTRY): Use the more descriptive
	INCLUDE_gdiplus instead of INCLUDE_gdi. (Will be used when this is
	moved to GTK+ and the gdip loaders are built-in in libgdk-pixbuf.)
	Use G_MODULE_EXPORT so that only the fill_info and fill_vtable get
	exported in the separate loader DLLs case.

	* src/io-gdip-emf.c
	* src/io-gdip-ico.c
	* src/io-gdip-wmf.c: Use unique type parameters to MODULE_ENTRY so
	that we won't get clashes when building all the gdip loaders in to
	libgdk-pixbuf.



Modified:
   trunk/ChangeLog
   trunk/src/io-gdip-emf.c
   trunk/src/io-gdip-ico.c
   trunk/src/io-gdip-utils.h
   trunk/src/io-gdip-wmf.c

Modified: trunk/src/io-gdip-emf.c
==============================================================================
--- trunk/src/io-gdip-emf.c	(original)
+++ trunk/src/io-gdip-emf.c	Mon Mar 17 00:01:08 2008
@@ -24,13 +24,13 @@
 #include "io-gdip-utils.h"
 
 void
-MODULE_ENTRY (gdi, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (emf, fill_vtable) (GdkPixbufModule *module)
 {
   gdip_fill_vector_vtable (module);
 }
 
 void
-MODULE_ENTRY (gdi, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (emf, fill_info) (GdkPixbufFormat *info)
 {
   static GdkPixbufModulePattern signature[] = {
     { "\x01\x00\x09\x00", NULL, 100 }, /* WMF */

Modified: trunk/src/io-gdip-ico.c
==============================================================================
--- trunk/src/io-gdip-ico.c	(original)
+++ trunk/src/io-gdip-ico.c	Mon Mar 17 00:01:08 2008
@@ -24,13 +24,13 @@
 #include "io-gdip-utils.h"
 
 void
-MODULE_ENTRY (gdi, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (ico, fill_vtable) (GdkPixbufModule *module)
 {
   gdip_fill_vtable (module);
 }
 
 void
-MODULE_ENTRY (gdi, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (ico, fill_info) (GdkPixbufFormat *info)
 {
   static GdkPixbufModulePattern signature[] = {
     { "  \x1   ", "zz znz", 100 }, /* ICO */

Modified: trunk/src/io-gdip-utils.h
==============================================================================
--- trunk/src/io-gdip-utils.h	(original)
+++ trunk/src/io-gdip-utils.h	Mon Mar 17 00:01:08 2008
@@ -35,8 +35,8 @@
 
 #include "io-gdip-native.h"
 
-#ifndef INCLUDE_gdi
-#define MODULE_ENTRY(type,function) function
+#ifndef INCLUDE_gdiplus
+#define MODULE_ENTRY(type,function) G_MODULE_EXPORT function
 #else
 #define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
 #endif

Modified: trunk/src/io-gdip-wmf.c
==============================================================================
--- trunk/src/io-gdip-wmf.c	(original)
+++ trunk/src/io-gdip-wmf.c	Mon Mar 17 00:01:08 2008
@@ -24,13 +24,13 @@
 #include "io-gdip-utils.h"
 
 void
-MODULE_ENTRY (gdi, fill_vtable) (GdkPixbufModule *module)
+MODULE_ENTRY (wmf, fill_vtable) (GdkPixbufModule *module)
 {
   gdip_fill_vector_vtable (module);
 }
 
 void
-MODULE_ENTRY (gdi, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (wmf, fill_info) (GdkPixbufFormat *info)
 {
   static GdkPixbufModulePattern signature[] = {
     { "\xd7\xcd\xc6\x9a", NULL, 100 }, /* WMF */