mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-20 04:50:55 -07:00
Code Issues Projects Releases Wiki Activity

(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename

Browse source 
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
This commit is contained in:
Glenn Morris 2007-09-14 07:44:49 +00:00
parent ac1281ac7d
commit a99dc82bd8
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2007-09-14 Glenn Morris <rgm@gnu.org>
* fringe.c (init_fringe_bitmap) <swap nibble>: Move to file scope.
* gtkutil.c (xg_separator_p) <separator_names>: Move to file scope.
* image.c (our_memory_fill_input_buffer) <buffer>: Move to file
scope and rename to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
2007-09-14 Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change)
* gtkutil.c (xg_get_file_with_chooser): Move GCPRO1 after declarations.

14
src/image.c
View file

@ -6769,18 +6769,19 @@ 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 boolean
our_memory_fill_input_buffer (cinfo)
j_decompress_ptr cinfo;
{
/* Insert a fake EOI marker. */
struct jpeg_source_mgr *src = cinfo->src;
static JOCTET buffer[2];
buffer[0] = (JOCTET) 0xFF;
buffer[1] = (JOCTET) JPEG_EOI;
omfib_buffer[0] = (JOCTET) 0xFF;
omfib_buffer[1] = (JOCTET) JPEG_EOI;
src->next_input_byte = buffer;
src->next_input_byte = omfib_buffer;
src->bytes_in_buffer = 2;
return 1;
}
@ -7750,6 +7751,9 @@ gif_read_from_memory (file, buf, len)
/* Load GIF image IMG for use on frame F. Value is non-zero if
successful. */
static int interlace_start[] = {0, 4, 2, 1};
static int interlace_increment[] = {8, 8, 4, 2};
static int
gif_load (f, img)
struct frame *f;
@ -7920,8 +7924,6 @@ gif_load (f, img)
if (gif->SavedImages[ino].ImageDesc.Interlace)
{
static int interlace_start[] = {0, 4, 2, 1};
static int interlace_increment[] = {8, 8, 4, 2};
int pass;
int row = interlace_start[0];