[Emacs-diffs] Changes to emacs/src/image.c

[Juanma Barranquero]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.27 emacs/src/image.c:1.28
*** emacs/src/image.c:1.27      Sat Jun 11 16:24:36 2005
--- emacs/src/image.c   Thu Jun 23 07:48:13 2005
***************
*** 5631,5637 ****
  DEF_IMGLIB_FN (png_create_info_struct);
  DEF_IMGLIB_FN (png_destroy_read_struct);
  DEF_IMGLIB_FN (png_set_read_fn);
- DEF_IMGLIB_FN (png_init_io);
  DEF_IMGLIB_FN (png_set_sig_bytes);
  DEF_IMGLIB_FN (png_read_info);
  DEF_IMGLIB_FN (png_get_IHDR);
--- 5631,5636 ----
***************
*** 5663,5669 ****
    LOAD_IMGLIB_FN (library, png_create_info_struct);
    LOAD_IMGLIB_FN (library, png_destroy_read_struct);
    LOAD_IMGLIB_FN (library, png_set_read_fn);
-   LOAD_IMGLIB_FN (library, png_init_io);
    LOAD_IMGLIB_FN (library, png_set_sig_bytes);
    LOAD_IMGLIB_FN (library, png_read_info);
    LOAD_IMGLIB_FN (library, png_get_IHDR);
--- 5662,5667 ----
***************
*** 5689,5695 ****
  #define fn_png_create_info_struct     png_create_info_struct
  #define fn_png_destroy_read_struct    png_destroy_read_struct
  #define fn_png_set_read_fn            png_set_read_fn
- #define fn_png_init_io                        png_init_io
  #define fn_png_set_sig_bytes          png_set_sig_bytes
  #define fn_png_read_info              png_read_info
  #define fn_png_get_IHDR                       png_get_IHDR
--- 5687,5692 ----
***************
*** 5762,5767 ****
--- 5759,5781 ----
  }
  
  
+ /* Function set as reader function when reading PNG image from a file.
+    PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
+    bytes from the input to DATA.  */
+ 
+ static void
+ png_read_from_file (png_ptr, data, length)
+      png_structp png_ptr;
+      png_bytep data;
+      png_size_t length;
+ {
+   FILE *fp = (FILE *) fn_png_get_io_ptr (png_ptr);
+ 
+   if (fread (data, 1, length, fp) < length)
+     fn_png_error (png_ptr, "Read error");
+ }
+ 
+ 
  /* Load PNG image IMG for use on frame F.  Value is non-zero if
     successful.  */
  
***************
*** 5895,5901 ****
    if (!NILP (specified_data))
      fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
    else
!     fn_png_init_io (png_ptr, fp);
  
    fn_png_set_sig_bytes (png_ptr, sizeof sig);
    fn_png_read_info (png_ptr, info_ptr);
--- 5909,5915 ----
    if (!NILP (specified_data))
      fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
    else
!     fn_png_set_read_fn (png_ptr, (void *) fp, png_read_from_file);
  
    fn_png_set_sig_bytes (png_ptr, sizeof sig);
    fn_png_read_info (png_ptr, info_ptr);