diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-11 14:04:23 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-11 14:04:23 +0000 |
| commit | 49295f0d9302c7b042e2ecd3a070d5c5f5cd0ea3 (patch) | |
| tree | 976c787c8d3b330f1d6e825b3b9f519bd1ecee05 /Build | |
| parent | 6c78d2b79d507e086cb5d04a769a96153e29357e (diff) | |
pdftosrc: Always use new logic for Object Streams
git-svn-id: svn://tug.org/texlive/trunk@24265 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftosrc.cc | 19 |
2 files changed, 5 insertions, 19 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 63c5fb59411..cb09ae3564b 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2011-10-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pdftosrc.cc: Always use new logic for Object Streams + (for xpdf without patch-40-objectStream-support-for-pdftosrc). + 2011-09-30 Peter Breitenlohner <peb@mppmu.mpg.de> * wprob.test: New shell script to test for uninitialized line. diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc index cd563cf57f4..66a02fb182c 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc @@ -150,7 +150,6 @@ int main(int argc, char *argv[]) (long unsigned) e->offset, e->gen, (e->type == xrefEntryFree ? "f" : "n")); else { // e->offset is the object number of the object stream -#ifdef POPPLER_VERSION Stream *str; Parser *parser; Object objStr, obj1, obj2; @@ -184,24 +183,6 @@ int main(int argc, char *argv[]) fprintf(outfile, "%.10lu 00000 n\n", (long unsigned)(firstOffset + localOffset)); -#else - // e->gen is the local index inside that object stream - //int objStrOffset = xref->getEntry(e->offset)->offset; - Object tmpObj; - - xref->fetch(i, e->gen, &tmpObj); // to ensure xref->objStr is set - ObjectStream *objStr = xref->getObjStr(); - assert(objStr != NULL); - int *localOffsets = objStr->getOffsets(); - assert(localOffsets != NULL); -// fprintf(outfile, "%0.10lu %i n\n", -// (long unsigned) (objStrOffset), e->gen); - fprintf(outfile, "%.10lu 00000 n\n", - (long unsigned) (objStr->getFirstOffset() + - localOffsets[e->gen])); -// (long unsigned) (objStrOffset + objStr->getStart() + localOffsets[e->gen])); - tmpObj.free(); -#endif } } } else { |