Commit e0c1ab3f authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

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
parent 63023841
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)
......
......@@ -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);
}
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment