(jpeg_load, png_load, slurp_file): Read image files

as binary.

diff --git a/src/ChangeLog b/src/ChangeLog
index ab09ba9f34ed6d39e49aa21d87b6adceb83fd12a..50416679da5e8d6860a3d030475682d8c6272c8b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-16  Jason Rumney  <jasonr@gnu.org>
+
+       * w32gui.h: Use HDC for Display.
+
+       * w32term.c (w32_encode_char): Prevent double-byte chars from
+       crashing Emacs.
+
+       * w32fns.c (jpeg_load, png_load, slurp_file): Read image files
+       as binary.
+
 2003-03-16  Juanma Barranquero  <lektu@terra.es>
 
        * xdisp.c (x_produce_glyphs): Use FRAME_BASELINE_OFFSET.

diff --git a/src/w32fns.c b/src/w32fns.c
index 42c0feb723e2c9fa3b8739bda53164fe2b4963cf..ad32e5a19152fb68cb11c34fb5743f16eb53d954 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9535,7 +9535,7 @@ slurp_file (file, size)
   struct stat st;
 
   if (stat (file, &st) == 0
-      && (fp = fopen (file, "r")) != NULL
+      && (fp = fopen (file, "rb")) != NULL
       && (buf = (char *) xmalloc (st.st_size),
          fread (buf, 1, st.st_size, fp) == st.st_size))
     {
@@ -11402,7 +11402,7 @@ pbm_read_file (file, size)
   struct stat st;
 
   if (stat (SDATA (file), &st) == 0
-      && (fp = fopen (SDATA (file), "r")) != NULL
+      && (fp = fopen (SDATA (file), "rb")) != NULL
       && (buf = (char *) xmalloc (st.st_size),
          fread (buf, 1, st.st_size, fp) == st.st_size))
     {
@@ -12495,7 +12495,7 @@ jpeg_load (f, img)
          return 0;
        }
 
-      fp = fopen (SDATA (file), "r");
+      fp = fopen (SDATA (file), "rb");
       if (fp == NULL)
        {
          image_error ("Cannot open `%s'", file, Qnil);