Fix I/O suspension. This little nugget of code was introduced in r30 as part of an early attempt to make buffered I/O work with the optimized Huffman codec. Ultimately, r32 reverted a lot of that mess and introduced much of the logic we now use, rendering this code unnecessary, but it was never reverted because it only causes problems when I/O suspension is used, and apparently no one has tried to do that with libjpeg-turbo until now.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@1033 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2013-09-24 03:26:47 +00:00
parent e2394fc58a
commit ba923a8529
2 changed files with 3 additions and 2 deletions

View File

@@ -12,6 +12,9 @@ Ubuntu 11 and later) without setting the linker path.
multiple "Mismatch in operand sizes" errors when attempting to build the x86 multiple "Mismatch in operand sizes" errors when attempting to build the x86
SIMD code with NASM 0.98. SIMD code with NASM 0.98.
[4] Fixed a Huffman encoder bug that prevented I/O suspension from working
properly.
1.2.1 1.2.1
===== =====

View File

@@ -299,8 +299,6 @@ dump_buffer (working_state * state)
{ {
struct jpeg_destination_mgr * dest = state->cinfo->dest; struct jpeg_destination_mgr * dest = state->cinfo->dest;
dest->free_in_buffer = state->free_in_buffer;
if (! (*dest->empty_output_buffer) (state->cinfo)) if (! (*dest->empty_output_buffer) (state->cinfo))
return FALSE; return FALSE;
/* After a successful buffer dump, must reset buffer pointers */ /* After a successful buffer dump, must reset buffer pointers */