From: Miles Bader <miles@gnu.org>
Date: Tue, 9 Oct 2007 10:28:47 +0000 (+0000)
Subject: Add missing change from rel-22 branch to src/image.c
X-Git-Tag: emacs-pretest-23.0.90~10464
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a1539f38564e842af589e46206e1d95407be795;p=emacs.git

Add missing change from rel-22 branch to src/image.c

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-877
---

diff --git a/src/image.c b/src/image.c
index 81a42f91da2..16826c425fa 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6777,7 +6777,7 @@ our_common_term_source (cinfo)
    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 @@ our_memory_fill_input_buffer (cinfo)
   /* Insert a fake EOI marker.  */
   struct jpeg_source_mgr *src = cinfo->src;
 
-  omfib_buffer[0] = (JOCTET) 0xFF;
-  omfib_buffer[1] = (JOCTET) JPEG_EOI;
+  our_memory_buffer[0] = (JOCTET) 0xFF;
+  our_memory_buffer[1] = (JOCTET) JPEG_EOI;
 
-  src->next_input_byte = omfib_buffer;
+  src->next_input_byte = our_memory_buffer;
   src->bytes_in_buffer = 2;
   return 1;
 }