diff options
| author | Hans Breuer <hans@breuer.org> | 2008-06-13 08:27:02 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2008-06-13 08:27:02 +0000 |
| commit | 564438693bc0d880489aa349ce62081cdd7f3e46 (patch) | |
| tree | 8feafb38a36025c762e97072a252428a56584731 /gdk-pixbuf | |
| parent | 58c5051ebdc55fa193d7359d26c1a8aca35c9162 (diff) | |
| download | gdk-pixbuf-564438693bc0d880489aa349ce62081cdd7f3e46.tar.gz | |
updated to allow simple switch between gdiplus- and former fileformat
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
svn path=/trunk/; revision=20369
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/io-tiff.c | 2 | ||||
| -rw-r--r-- | gdk-pixbuf/makefile.msc | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index 64da06488..84ddd0266 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -262,7 +262,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error) 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); } diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc index 1aee96225..62020f4ea 100644 --- a/gdk-pixbuf/makefile.msc +++ b/gdk-pixbuf/makefile.msc @@ -13,13 +13,22 @@ GDK_PIXBUF_VER = 2.0 # -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 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \ # -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 @@ OBJECTS = \ io-pnm.obj \ io-ras.obj \ io-xpm.obj \ +!IFDEF USEGDIP $(OBJECTS_NATIVE) +!ELSE + $(OBJECTS_NON_NATIVE) +!ENDIF gdk_pixbuf_headers = \ gdk-pixbuf.h \ |