Replace EOI marker in JPEG passthrough

Bug #699216 " JPEG passthrough appears to truncate JPEGs in some cases"

The IJG JPEG implementation consumes the EOI marker before the JPEG
passthrough code gets to see it (in general). Most PDF consumers don't
care, but some seem to, so when we terminate the DCT decompression
send the EOI marker to the passthrough code.

1 files changed, 5 insertions, 1 deletions

diff --git a/base/sdctd.c b/base/sdctd.c
index 75750f43e..b687054c1 100644
--- a/base/sdctd.c
+++ b/base/sdctd.c
@@ -73,12 +73,16 @@ dctd_skip_input_data(j_decompress_ptr dinfo, long num_bytes)
 static void
 dctd_term_source(j_decompress_ptr dinfo)
 {
+    char EOI[2] = {0xff, 0xD9};
+
     jpeg_decompress_data *jddp =
     (jpeg_decompress_data *) ((char *)dinfo -
                               offset_of(jpeg_decompress_data, dinfo));
 
-    if (jddp->PassThrough && jddp->PassThroughfn)
+    if (jddp->PassThrough && jddp->PassThroughfn) {
+        (jddp->PassThroughfn)(jddp->device, (byte *)EOI, 2);
         (jddp->PassThroughfn)(jddp->device, NULL, 0);
+    }
     return;
 }