summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdk-pixbuf/ChangeLog5
-rw-r--r--gdk-pixbuf/io-jpeg.c4
-rw-r--r--gdk-pixbuf/makefile.msc3
3 files changed, 9 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 730a53379d..1ab9170c4b 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15 Hans Breuer <hans@breuer.org>
+
+ * makefile.msc : updated
+ * io-jpeg.c : use g_snprintf
+
2007-06-12 Behdad Esfahbod <behdad@gnome.org>
* io-pnm.c (explode_bitmap_into_buf): Fix out-of-bound access.
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index b88675c98f..67327162bd 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -514,7 +514,7 @@ gdk_pixbuf__jpeg_image_load (FILE *f, GError **error)
/* if orientation tag was found set an option to remember its value */
if (is_otag) {
- snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
+ g_snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
gdk_pixbuf_set_option (pixbuf, "orientation", otag_str);
}
@@ -923,7 +923,7 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
/* if orientation tag was found set an option to remember its value */
if (is_otag) {
- snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
+ g_snprintf (otag_str, sizeof (otag_str), "%d", is_otag);
gdk_pixbuf_set_option (context->pixbuf, "orientation", otag_str);
}
diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index e8dcefc30b..668b44d88e 100644
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -42,6 +42,7 @@ OBJECTS = \
gdk-pixbuf-io.obj \
gdk-pixbuf-loader.obj \
gdk-pixbuf-scale.obj \
+ gdk-pixbuf-scaled-anim.obj \
gdk-pixbuf-util.obj \
gdk-pixbuf.obj \
gdk-pixbuf-simple-anim.obj \
@@ -76,7 +77,7 @@ gdk-pixbuf-alias.h: gdk-pixbuf.symbols
gdk_pixbuf.def: gdk-pixbuf.symbols makefile.msc
echo EXPORTS > gdk_pixbuf.def
cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES \
-# -FI $(GLIB)\glib\gmacros.h \
+ -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF \
gdk-pixbuf.symbols >> gdk_pixbuf.def
gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols