Mercurial > emacs

changeset 85118:9c9740553555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing change from rel-22 branch to src/image.c Revision: emacs@sv.gnu.org/emacs--devo--0--patch-877
author Miles Bader <miles@gnu.org>
date Tue, 09 Oct 2007 10:28:47 +0000
parents 5825529bdc98
children 315eb0aa2341
files src/image.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/image.c	Tue Oct 09 09:46:55 2007 +0000
+++ b/src/image.c	Tue Oct 09 10:28:47 2007 +0000
@@ -6777,7 +6777,7 @@
    whenever more data is needed.  We read the whole image in one step,
    so this only adds a fake end of input marker at the end.  */
 
-static JOCTET omfib_buffer[2];
+static JOCTET our_memory_buffer[2];
 
 static boolean
 our_memory_fill_input_buffer (cinfo)
@@ -6786,10 +6786,10 @@
   /* Insert a fake EOI marker.  */
   struct jpeg_source_mgr *src = cinfo->src;
 
-  omfib_buffer[0] = (JOCTET) 0xFF;
-  omfib_buffer[1] = (JOCTET) JPEG_EOI;
-
-  src->next_input_byte = omfib_buffer;
+  our_memory_buffer[0] = (JOCTET) 0xFF;
+  our_memory_buffer[1] = (JOCTET) JPEG_EOI;
+
+  src->next_input_byte = our_memory_buffer;
   src->bytes_in_buffer = 2;
   return 1;
 }