From 463eb3a18155d848733e33afbc75bfdccc9a1784 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 16 Mar 2015 16:57:13 +0000 Subject: Update bundled libjpeg from jpeg-8c to jpeg-9a. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10626 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- jpeg/jdatasrc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'jpeg/jdatasrc.c') diff --git a/jpeg/jdatasrc.c b/jpeg/jdatasrc.c index c8fe3daf3..7be59a88a 100644 --- a/jpeg/jdatasrc.c +++ b/jpeg/jdatasrc.c @@ -2,7 +2,7 @@ * jdatasrc.c * * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009-2010 by Guido Vollbeding. + * Modified 2009-2011 by Guido Vollbeding. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -121,16 +121,17 @@ fill_input_buffer (j_decompress_ptr cinfo) METHODDEF(boolean) fill_mem_input_buffer (j_decompress_ptr cinfo) { - static JOCTET mybuffer[4]; + static const JOCTET mybuffer[4] = { + (JOCTET) 0xFF, (JOCTET) JPEG_EOI, 0, 0 + }; /* The whole JPEG data is expected to reside in the supplied memory * buffer, so any request for more data beyond the given buffer size * is treated as an error. */ WARNMS(cinfo, JWRN_JPEG_EOF); + /* Insert a fake EOI marker */ - mybuffer[0] = (JOCTET) 0xFF; - mybuffer[1] = (JOCTET) JPEG_EOI; cinfo->src->next_input_byte = mybuffer; cinfo->src->bytes_in_buffer = 2; -- cgit v1.2.3