summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2008-06-13 08:27:02 +0000
committerHans Breuer <hans@src.gnome.org>2008-06-13 08:27:02 +0000
commite0c1ab3f39aff64d3b00a66263a8592243ea4076 (patch)
tree938dc590a8ac265d0caf2a8a38ceaaaf468098d0 /gdk-pixbuf
parent6302384106e28b27c4c01e3dcf977a1e86476eea (diff)
downloadgtk+-e0c1ab3f39aff64d3b00a66263a8592243ea4076.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/ChangeLog6
-rw-r--r--gdk-pixbuf/io-tiff.c2
-rw-r--r--gdk-pixbuf/makefile.msc21
3 files changed, 25 insertions, 4 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index d22b6c77d8..d0973342bb 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+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
+
2008-06-13 Matthias Clasen <mclasen@redhat.com>
Bug 531960 – crash in eog-image.c:1154: (priv->image != NULL)
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 64da064883..84ddd0266f 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 1aee962256..62020f4ea0 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 \