gtk+ r20369 - trunk/gdk-pixbuf

[hans svn gnome org]

Author: hans
Date: Fri Jun 13 08:27:02 2008
New Revision: 20369
URL: http://svn.gnome.org/viewvc/gtk+?rev=20369&view=rev

Log:
2008-06-13  Hans Breuer  <hans breuer org>

	* makefile.msc : updated to allow simple switch between gdiplus- and
	former fileformat backends
	* io-tiff.c : use g_snprintf


Modified:
   trunk/gdk-pixbuf/ChangeLog
   trunk/gdk-pixbuf/io-tiff.c
   trunk/gdk-pixbuf/makefile.msc

Modified: trunk/gdk-pixbuf/io-tiff.c
==============================================================================
--- trunk/gdk-pixbuf/io-tiff.c	(original)
+++ trunk/gdk-pixbuf/io-tiff.c	Fri Jun 13 08:27:02 2008
@@ -262,7 +262,7 @@
 
 	if (transform > 0 ) {
 		gchar str[5];
-		snprintf (str, sizeof (str), "%d", transform);
+		g_snprintf (str, sizeof (str), "%d", transform);
 		gdk_pixbuf_set_option (pixbuf, "orientation", str);
 	}
 

Modified: trunk/gdk-pixbuf/makefile.msc
==============================================================================
--- trunk/gdk-pixbuf/makefile.msc	(original)
+++ trunk/gdk-pixbuf/makefile.msc	Fri Jun 13 08:27:02 2008
@@ -13,13 +13,22 @@
 
 # -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff
 # but not yet -DINCLUDE_png 
+##USEGDIP=1
 # to get _working_ include modules we need respective defines ...
-BUILT_IN_FORMATS = -DINCLUDE_gdiplus -DINCLUDE_png \
+BUILT_IN_FORMATS = \
+!IFDEF USEGDIP
+	-DINCLUDE_gdiplus \
+!ELSE
+	-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff \
+!ENDIF
+	-DINCLUDE_png \
 	-DINCLUDE_xpm -DINCLUDE_wbmp \
 	-DINCLUDE_pnm -DINCLUDE_ras
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
-# 	$(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+!IFNDEF USEGDIP
+ 	$(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+!ENDIF
 	-I. -I.. $(GLIB_CFLAGS) \
 	$(BUILT_IN_FORMATS) \
 	$(PNG_CFLAGS) $(INTL_CFLAGS) \
@@ -30,7 +39,9 @@
 #	-DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
 
 PKG_LINK = $(GLIB_LIBS) \
-#	$(TIFF_LIBS) $(JPEG_LIBS) \
+!IFNDEF USEGDIP
+	$(TIFF_LIBS) $(JPEG_LIBS) \
+!ENDIF
 	$(PNG_LIBS) $(INTL_LIBS) \
 	pixops\pixops.lib \
  
@@ -70,7 +81,11 @@
 	io-pnm.obj \
 	io-ras.obj \
 	io-xpm.obj \
+!IFDEF USEGDIP
 	$(OBJECTS_NATIVE)
+!ELSE
+	$(OBJECTS_NON_NATIVE)
+!ENDIF
 
 gdk_pixbuf_headers = 	\
 	gdk-pixbuf.h	\