aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2013-04-25 08:55:31 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2013-04-25 08:55:31 +0000
commit9b9ee28278e2eb49e1174f862851c8f449f600f7 (patch)
treef97a9b522f7f403317a9d6ad78d721b2f2956f09
parentb8c73ffb4064a00ea3845a1cbe1b4ea6f765662e (diff)
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://svn.code.sf.net/p/libjpeg-turbo/code/trunk@954 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r--ChangeLog.txt3
-rw-r--r--jchuff.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9780acf..780cc9e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -28,6 +28,9 @@ WITH_JAVA=1 would fail if the TurboJPEG JAR had not been previously built.
-- Building the "install" target on Windows now installs files into the same
places that the installer does.
+[3] Fixed a Huffman encoder bug that prevented I/O suspension from working
+properly.
+
1.2.90 (1.3 beta1)
==================
diff --git a/jchuff.c b/jchuff.c
index 33da002..887614d 100644
--- a/jchuff.c
+++ b/jchuff.c
@@ -299,8 +299,6 @@ dump_buffer (working_state * state)
{
struct jpeg_destination_mgr * dest = state->cinfo->dest;
- dest->free_in_buffer = state->free_in_buffer;
-
if (! (*dest->empty_output_buffer) (state->cinfo))
return FALSE;
/* After a successful buffer dump, must reset buffer pointers */