changeset 66014:3873fa9d3eb4

*** empty log message ***
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 11 Oct 2005 08:32:08 +0000
parents 1de4729d29d6
children 4ad1dc6bc1e0
files admin/ChangeLog src/ChangeLog
diffstat 2 files changed, 23 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/admin/ChangeLog	Tue Oct 11 08:25:27 2005 +0000
+++ b/admin/ChangeLog	Tue Oct 11 08:32:08 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* FOR-RELEASE (FATAL ERRORS): Remove item about JPEG
+	libraries on Windows (Done).
+
 2005-10-01  Jason Rumney  <jasonr@gnu.org>
 
 	* admin.el (set-version): Set version numbers in nt/emacs.rc.
--- a/src/ChangeLog	Tue Oct 11 08:25:27 2005 +0000
+++ b/src/ChangeLog	Tue Oct 11 08:32:08 2005 +0000
@@ -1,3 +1,19 @@
+2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* image.c (fn_jpeg_stdio_src): Don't define it.
+	(init_jpeg_functions): Don't initialize `fn_jpeg_stdio_src'.
+	(our_common_init_source): Rename from `our_init_source'.
+	(our_common_term_source): Rename from `our_term_source'.
+	(our_memory_fill_input_buffer): Rename from
+	`our_fill_input_buffer'.
+	(our_memory_skip_input_data): Rename from `our_skip_input_data'.
+	(jpeg_memory_src): Use the new names.
+	(struct jpeg_stdio_mgr): New struct.
+	(JPEG_STDIO_BUFFER_SIZE): New constant.
+	(our_stdio_fill_input_buffer, our_stdio_skip_input_data)
+	(jpeg_file_src): New functions.
+	(jpeg_load): Use `jpeg_file_src' instead of `fn_jpeg_stdio_src'.
+
 2005-10-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c (PER_CHAR_METRIC): Remove unused macro.
@@ -1620,7 +1636,7 @@
 2005-06-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* macmenu.c (cleanup_popup_menu): New function.
-	(Fx_popup_menu): unwind protect cleanup_popup_menu in case
+	(Fx_popup_menu): Unwind protect cleanup_popup_menu in case
 	mac_menu_show Quit:s.
 	(mac_menu_show): Quit on cancel if not popped up on click (i.e.
 	a dialog).
@@ -16922,7 +16938,7 @@
 	* w32.c (sys_getpeername, fcntl): New functions.
 	(_sys_read_ahead): Temporarily block on non-blocking sockets.
 
-	* w32proc.c: include sys/file.h.
+	* w32proc.c: Include sys/file.h.
 
 2002-05-03  Colin Walters  <walters@verbum.org>