/[emacs]/emacs/src/image.c
ViewVC logotype

Diff of /emacs/src/image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.27 by eliz, Sat Jun 11 16:24:36 2005 UTC revision 1.28 by lektu, Thu Jun 23 07:48:13 2005 UTC
# Line 5631  DEF_IMGLIB_FN (png_create_read_struct); Line 5631  DEF_IMGLIB_FN (png_create_read_struct);
5631  DEF_IMGLIB_FN (png_create_info_struct);  DEF_IMGLIB_FN (png_create_info_struct);
5632  DEF_IMGLIB_FN (png_destroy_read_struct);  DEF_IMGLIB_FN (png_destroy_read_struct);
5633  DEF_IMGLIB_FN (png_set_read_fn);  DEF_IMGLIB_FN (png_set_read_fn);
 DEF_IMGLIB_FN (png_init_io);  
5634  DEF_IMGLIB_FN (png_set_sig_bytes);  DEF_IMGLIB_FN (png_set_sig_bytes);
5635  DEF_IMGLIB_FN (png_read_info);  DEF_IMGLIB_FN (png_read_info);
5636  DEF_IMGLIB_FN (png_get_IHDR);  DEF_IMGLIB_FN (png_get_IHDR);
# Line 5663  init_png_functions (Lisp_Object librarie Line 5662  init_png_functions (Lisp_Object librarie
5662    LOAD_IMGLIB_FN (library, png_create_info_struct);    LOAD_IMGLIB_FN (library, png_create_info_struct);
5663    LOAD_IMGLIB_FN (library, png_destroy_read_struct);    LOAD_IMGLIB_FN (library, png_destroy_read_struct);
5664    LOAD_IMGLIB_FN (library, png_set_read_fn);    LOAD_IMGLIB_FN (library, png_set_read_fn);
   LOAD_IMGLIB_FN (library, png_init_io);  
5665    LOAD_IMGLIB_FN (library, png_set_sig_bytes);    LOAD_IMGLIB_FN (library, png_set_sig_bytes);
5666    LOAD_IMGLIB_FN (library, png_read_info);    LOAD_IMGLIB_FN (library, png_read_info);
5667    LOAD_IMGLIB_FN (library, png_get_IHDR);    LOAD_IMGLIB_FN (library, png_get_IHDR);
# Line 5689  init_png_functions (Lisp_Object librarie Line 5687  init_png_functions (Lisp_Object librarie
5687  #define fn_png_create_info_struct       png_create_info_struct  #define fn_png_create_info_struct       png_create_info_struct
5688  #define fn_png_destroy_read_struct      png_destroy_read_struct  #define fn_png_destroy_read_struct      png_destroy_read_struct
5689  #define fn_png_set_read_fn              png_set_read_fn  #define fn_png_set_read_fn              png_set_read_fn
 #define fn_png_init_io                  png_init_io  
5690  #define fn_png_set_sig_bytes            png_set_sig_bytes  #define fn_png_set_sig_bytes            png_set_sig_bytes
5691  #define fn_png_read_info                png_read_info  #define fn_png_read_info                png_read_info
5692  #define fn_png_get_IHDR                 png_get_IHDR  #define fn_png_get_IHDR                 png_get_IHDR
# Line 5762  png_read_from_memory (png_ptr, data, len Line 5759  png_read_from_memory (png_ptr, data, len
5759  }  }
5760    
5761    
5762    /* Function set as reader function when reading PNG image from a file.
5763       PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
5764       bytes from the input to DATA.  */
5765    
5766    static void
5767    png_read_from_file (png_ptr, data, length)
5768         png_structp png_ptr;
5769         png_bytep data;
5770         png_size_t length;
5771    {
5772      FILE *fp = (FILE *) fn_png_get_io_ptr (png_ptr);
5773    
5774      if (fread (data, 1, length, fp) < length)
5775        fn_png_error (png_ptr, "Read error");
5776    }
5777    
5778    
5779  /* Load PNG image IMG for use on frame F.  Value is non-zero if  /* Load PNG image IMG for use on frame F.  Value is non-zero if
5780     successful.  */     successful.  */
5781    
# Line 5895  png_load (f, img) Line 5909  png_load (f, img)
5909    if (!NILP (specified_data))    if (!NILP (specified_data))
5910      fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);      fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
5911    else    else
5912      fn_png_init_io (png_ptr, fp);      fn_png_set_read_fn (png_ptr, (void *) fp, png_read_from_file);
5913    
5914    fn_png_set_sig_bytes (png_ptr, sizeof sig);    fn_png_set_sig_bytes (png_ptr, sizeof sig);
5915    fn_png_read_info (png_ptr, info_ptr);    fn_png_read_info (png_ptr, info_ptr);

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26