summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan The Thanh <hanthethanh@gmail.com>2008-07-16 14:09:41 +0000
committerHan The Thanh <hanthethanh@gmail.com>2008-07-16 14:09:41 +0000
commit912fe90543364834ade10f0be86a02416c10950f (patch)
tree8f88bb7deb985bcf47ad4c3efd2d5c502c483b8d
parent79c363ea23c480baeba85b59616dec73cc032c97 (diff)
pdftex bugfix for pdf inclusion
git-svn-id: svn://tug.org/texlive/trunk@9600 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web1
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc10
2 files changed, 7 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 1acc49ef059..49a81e30606 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -15261,6 +15261,7 @@ begin
pdf_seek_write_length := true; {fill in length at |pdf_end_stream| call}
pdf_stream_length_offset := pdf_offset - 11;
pdf_stream_length := 0;
+ pdf_last_byte := 0;
if pdf_compress_level > 0 then begin
pdf_print_ln("/Filter /FlateDecode");
pdf_print_ln(">>");
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index 76ba973eb76..e0d0ad8946c 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -46,7 +46,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "epdf.h"
static const char _svn_version[] =
- "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc $";
+ "$Id$ $URL: svn://192.168.0.1/svnroot/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc $";
// This file is mostly C and not very much C++; it's just used to interface
// the functions of xpdf, which happens to be written in C++.
@@ -339,11 +339,13 @@ static void copyFontDict(Object * obj, InObj * r)
static void copyStream(Stream * str)
{
- int c;
+ int c, c2;
str->reset();
- while ((c = str->getChar()) != EOF)
+ while ((c = str->getChar()) != EOF) {
pdfout(c);
- pdflastbyte = pdfbuf[pdfptr - 1];
+ c2 = c;
+ }
+ pdflastbyte = c2;
}
static void copyProcSet(Object * obj)