--- xpdf-0.80-decrypt.patch Wed Jun 9 21:56:17 1999 +++ sd0:xpdf-0.80-decrypt.patch Fri Jun 25 19:54:55 1999 @@ -1,6 +1,6 @@ -diff -u -b -B -w -r -N xpdf-0.80.orig/README.decryption xpdf-0.80-decrypt/README.decryption +diff -u -b -B -r -N -w xpdf-0.80.orig/README.decryption xpdf-0.80-decrypt/README.decryption --- xpdf-0.80.orig/README.decryption Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/README.decryption Wed Jun 9 20:54:38 1999 ++++ xpdf-0.80-decrypt/README.decryption Fri Jun 25 18:43:40 1999 @@ -0,0 +1,103 @@ +xpdf version 0.80 with decryption patches + @@ -105,10 +105,10 @@ + Computer Systems Officer Faculty of Science + University of Southern Queensland, Toowoomba Oueensland Australia + -=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=- -diff -u -b -B -w -r -N xpdf-0.80.orig/build040/xpdf/Makefile xpdf-0.80-decrypt/build040/xpdf/Makefile ---- xpdf-0.80.orig/build040/xpdf/Makefile Wed Jun 9 21:36:16 1999 -+++ xpdf-0.80-decrypt/build040/xpdf/Makefile Wed Jun 9 21:14:19 1999 -@@ -58,7 +58,9 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/build020/xpdf/Makefile xpdf-0.80-decrypt/build020/xpdf/Makefile +--- xpdf-0.80.orig/build020/xpdf/Makefile Thu Jun 24 18:18:46 1999 ++++ xpdf-0.80-decrypt/build020/xpdf/Makefile Fri Jun 25 19:49:24 1999 +@@ -59,7 +59,9 @@ $(srcdir)/AOutputDev.cc \ $(srcdir)/FontOutputDev.cc \ $(srcdir)/AGfx.cc \ @@ -119,27 +119,25 @@ #------------------------------------------------------------------------ -@@ -71,8 +73,9 @@ - APDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \ +@@ -73,7 +75,8 @@ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \ - GfxState.o Lexer.o Link.o Object.o OutputDev.o \ -- Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ + Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ - Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o -+ Page.o Params.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ + Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \ + md5.o rc4.o APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm Apdf: $(APDF_OBJS) -@@ -93,131 +96,144 @@ +@@ -96,137 +99,149 @@ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \ - ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h @@ -147,7 +145,7 @@ + ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \ + ../../xpdf/Catalog.h Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ @@ -155,59 +153,280 @@ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ - ../../xpdf/Lexer.h ../../xpdf/Parser.h ../../xpdf/GfxFont.h \ - ../../xpdf/GfxState.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ -- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Gfx.h -+ ../../xpdf/Gfx.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Gfx.h ++ ../../xpdf/Params.h ../../xpdf/Gfx.h GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Error.h ../../xpdf/Params.h ../../xpdf/GfxFont.h \ -- ../../xpdf/FontInfo.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Params.h \ -+ ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \ +- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/GfxState.h -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \ +- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ ++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h + Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h + Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Link.h ++ ../../xpdf/rc4.h ../../xpdf/Link.h + Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/XRef.h + OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/GfxState.h ../../xpdf/OutputDev.h + Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Params.h ../../xpdf/Page.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ ++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h + Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \ ++ ../../xpdf/XRef.h + PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \ +- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \ ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ ++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \ ../../xpdf/OutputDev.h - Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ + PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \ +- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ +- ../../xpdf/Error.h ../../xpdf/PDFDoc.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h + PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \ ++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h + Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h + TextOutputDev.o: ../../xpdf/TextOutputDev.cc \ + ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/TextOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h + XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ ++ ../../xpdf/XRef.h ../../xpdf/md5.h + Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h + Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ + ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \ +- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ + ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ +- ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h ++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h + AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \ +- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/FontOutputDev.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ ++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ ++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/FontOutputDev.h + FontOutputDev.o: ../../xpdf/FontOutputDev.cc \ + ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/XOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h + AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \ + ../../xpdf/poly.h + poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h ++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \ ++ ../../xpdf/config.h ++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h +diff -u -b -B -r -N -w xpdf-0.80.orig/build040/xpdf/Makefile xpdf-0.80-decrypt/build040/xpdf/Makefile +--- xpdf-0.80.orig/build040/xpdf/Makefile Thu Jun 24 18:16:45 1999 ++++ xpdf-0.80-decrypt/build040/xpdf/Makefile Fri Jun 25 19:47:55 1999 +@@ -59,7 +59,9 @@ + $(srcdir)/AOutputDev.cc \ + $(srcdir)/FontOutputDev.cc \ + $(srcdir)/AGfx.cc \ +- $(srcdir)/poly.cc ++ $(srcdir)/poly.cc \ ++ $(srcdir)/md5.cc \ ++ $(srcdir)/rc4.cc + + #------------------------------------------------------------------------ + +@@ -73,7 +75,8 @@ + TextOutputDev.o AOutputDev.o XRef.o AGfx.o \ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ + Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ +- Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o ++ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \ ++ md5.o rc4.o + APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm + + Apdf: $(APDF_OBJS) +@@ -96,137 +99,149 @@ + Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h +- ../../xpdf/Stream.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h - Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Link.h -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ -+ ../../xpdf/Link.h - Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \ ++ ../../xpdf/Catalog.h + Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -- ../../xpdf/XRef.h +- ../../xpdf/Stream.h ../../xpdf/XRef.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h ../../xpdf/XRef.h - OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h + Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h - Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Gfx.h ++ ../../xpdf/Params.h ../../xpdf/Gfx.h + GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \ +- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h + GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h + ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \ + ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \ + ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \ +- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ ++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h + Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h + Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Link.h ++ ../../xpdf/rc4.h ../../xpdf/Link.h + Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/XRef.h + OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/GfxState.h ../../xpdf/OutputDev.h + Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ @@ -217,15 +436,16 @@ + ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ + ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -- ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -+ ../../xpdf/md5.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \ ++ ../../xpdf/XRef.h PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \ @@ -236,39 +456,41 @@ ../../xpdf/OutputDev.h PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ -- ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/Error.h \ -- ../../xpdf/PDFDoc.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Catalog.h \ -+ ../../xpdf/XRef.h ../../xpdf/Link.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/Params.h ../../xpdf/PDFDoc.h - PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ - ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ -- ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ -- ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h +- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \ +- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ +- ../../xpdf/Error.h ../../xpdf/PDFDoc.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ -+ ../../xpdf/GfxState.h ../../xpdf/GfxFont.h ../../xpdf/Catalog.h \ -+ ../../xpdf/Page.h ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h ++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h + PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \ ++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Stream-CCITT.h -+ ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h TextOutputDev.o: ../../xpdf/TextOutputDev.cc \ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/TextOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/TextOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h @@ -278,22 +500,20 @@ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/XRef.h \ -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Error.h \ -+ ../../xpdf/config.h ../../xpdf/rc4.h ../../xpdf/XRef.h \ - ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/Link.h \ -- ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/config.h \ -- ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ -- ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ + ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \ +- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ + ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ - ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h -+ ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/AGfx.h ../../xpdf/poly.h ../../xpdf/TextOutputDev.h \ -+ ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h ../../xpdf/AComm.h ++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \ @@ -308,20 +528,21 @@ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/XOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/XOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \ ../../xpdf/poly.h poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h +md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \ + ../../xpdf/config.h +rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h -diff -u -b -B -w -r -N xpdf-0.80.orig/build060/xpdf/Makefile xpdf-0.80-decrypt/build060/xpdf/Makefile ---- xpdf-0.80.orig/build060/xpdf/Makefile Wed Jun 9 21:31:16 1999 -+++ xpdf-0.80-decrypt/build060/xpdf/Makefile Wed Jun 9 21:09:20 1999 -@@ -58,7 +58,10 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/build060/xpdf/Makefile xpdf-0.80-decrypt/build060/xpdf/Makefile +--- xpdf-0.80.orig/build060/xpdf/Makefile Thu Jun 24 18:18:12 1999 ++++ xpdf-0.80-decrypt/build060/xpdf/Makefile Fri Jun 25 19:49:06 1999 +@@ -59,7 +59,10 @@ $(srcdir)/AOutputDev.cc \ $(srcdir)/FontOutputDev.cc \ $(srcdir)/AGfx.cc \ @@ -333,9 +554,9 @@ #------------------------------------------------------------------------ -@@ -72,7 +75,8 @@ +@@ -73,7 +76,8 @@ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \ - GfxState.o Lexer.o Link.o Object.o OutputDev.o \ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ - Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o + Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \ @@ -343,15 +564,15 @@ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm Apdf: $(APDF_OBJS) -@@ -93,131 +97,144 @@ +@@ -96,137 +100,149 @@ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \ - ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h @@ -359,7 +580,7 @@ + ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \ + ../../xpdf/Catalog.h Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ @@ -367,59 +588,63 @@ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ - ../../xpdf/Lexer.h ../../xpdf/Parser.h ../../xpdf/GfxFont.h \ - ../../xpdf/GfxState.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ -- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Gfx.h -+ ../../xpdf/Gfx.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Gfx.h ++ ../../xpdf/Params.h ../../xpdf/Gfx.h GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Error.h ../../xpdf/Params.h ../../xpdf/GfxFont.h \ -- ../../xpdf/FontInfo.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Params.h \ -+ ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \ +- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/GfxState.h -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/ImageOutputDev.h \ - ../../xpdf/OutputDev.h + ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \ +- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ ++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Link.h -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ -+ ../../xpdf/Link.h + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Link.h ++ ../../xpdf/rc4.h ../../xpdf/Link.h Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -- ../../xpdf/XRef.h -+ ../../xpdf/rc4.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/XRef.h OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h - Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/GfxState.h ../../xpdf/OutputDev.h + Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ @@ -429,15 +654,16 @@ + ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ + ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -- ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -+ ../../xpdf/md5.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \ ++ ../../xpdf/XRef.h PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \ @@ -448,39 +674,41 @@ ../../xpdf/OutputDev.h PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ -- ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/Error.h \ -- ../../xpdf/PDFDoc.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Catalog.h \ -+ ../../xpdf/XRef.h ../../xpdf/Link.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/Params.h ../../xpdf/PDFDoc.h - PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ - ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ -- ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ -- ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h +- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \ +- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ +- ../../xpdf/Error.h ../../xpdf/PDFDoc.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ -+ ../../xpdf/GfxState.h ../../xpdf/GfxFont.h ../../xpdf/Catalog.h \ -+ ../../xpdf/Page.h ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h ++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h + PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \ ++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Stream-CCITT.h -+ ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h TextOutputDev.o: ../../xpdf/TextOutputDev.cc \ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/TextOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/TextOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h @@ -490,22 +718,20 @@ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/XRef.h \ -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Error.h \ -+ ../../xpdf/config.h ../../xpdf/rc4.h ../../xpdf/XRef.h \ - ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/Link.h \ -- ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/config.h \ -- ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ -- ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ + ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \ +- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ + ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ - ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h -+ ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/AGfx.h ../../xpdf/poly.h ../../xpdf/TextOutputDev.h \ -+ ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h ../../xpdf/AComm.h ++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \ @@ -520,20 +746,21 @@ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/XOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/XOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \ ../../xpdf/poly.h poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h +md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \ + ../../xpdf/config.h +rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h -diff -u -b -B -w -r -N xpdf-0.80.orig/buildnofpu/xpdf/Makefile xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile ---- xpdf-0.80.orig/buildnofpu/xpdf/Makefile Wed Jun 9 21:41:16 1999 -+++ xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile Wed Jun 9 21:19:27 1999 -@@ -58,7 +58,10 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/buildnofpu/xpdf/Makefile xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile +--- xpdf-0.80.orig/buildnofpu/xpdf/Makefile Thu Jun 24 18:19:20 1999 ++++ xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile Fri Jun 25 19:49:41 1999 +@@ -59,7 +59,10 @@ $(srcdir)/AOutputDev.cc \ $(srcdir)/FontOutputDev.cc \ $(srcdir)/AGfx.cc \ @@ -545,9 +772,9 @@ #------------------------------------------------------------------------ -@@ -72,7 +75,8 @@ +@@ -73,7 +76,8 @@ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \ - GfxState.o Lexer.o Link.o Object.o OutputDev.o \ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ - Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o + Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \ @@ -555,15 +782,15 @@ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm Apdf: $(APDF_OBJS) -@@ -93,131 +97,144 @@ +@@ -96,137 +100,149 @@ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \ - ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h @@ -571,7 +798,7 @@ + ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \ + ../../xpdf/Catalog.h Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ @@ -579,59 +806,63 @@ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ - ../../xpdf/Lexer.h ../../xpdf/Parser.h ../../xpdf/GfxFont.h \ - ../../xpdf/GfxState.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ -- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Gfx.h -+ ../../xpdf/Gfx.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Gfx.h ++ ../../xpdf/Params.h ../../xpdf/Gfx.h GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Error.h ../../xpdf/Params.h ../../xpdf/GfxFont.h \ -- ../../xpdf/FontInfo.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Params.h \ -+ ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \ +- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/GfxState.h -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/ImageOutputDev.h \ - ../../xpdf/OutputDev.h + ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \ +- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ ++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Link.h -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ -+ ../../xpdf/Link.h + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Link.h ++ ../../xpdf/rc4.h ../../xpdf/Link.h Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -- ../../xpdf/XRef.h -+ ../../xpdf/rc4.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/XRef.h OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h - Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/GfxState.h ../../xpdf/OutputDev.h + Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ @@ -641,15 +872,16 @@ + ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ + ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -- ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -+ ../../xpdf/md5.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \ ++ ../../xpdf/XRef.h PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \ @@ -660,39 +892,41 @@ ../../xpdf/OutputDev.h PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ -- ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/Error.h \ -- ../../xpdf/PDFDoc.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Catalog.h \ -+ ../../xpdf/XRef.h ../../xpdf/Link.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/Params.h ../../xpdf/PDFDoc.h - PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ - ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ -- ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ -- ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h +- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \ +- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ +- ../../xpdf/Error.h ../../xpdf/PDFDoc.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ -+ ../../xpdf/GfxState.h ../../xpdf/GfxFont.h ../../xpdf/Catalog.h \ -+ ../../xpdf/Page.h ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h ++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h + PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \ ++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Stream-CCITT.h -+ ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h TextOutputDev.o: ../../xpdf/TextOutputDev.cc \ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/TextOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/TextOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h @@ -702,22 +936,20 @@ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/XRef.h \ -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Error.h \ -+ ../../xpdf/config.h ../../xpdf/rc4.h ../../xpdf/XRef.h \ - ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/Link.h \ -- ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/config.h \ -- ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ -- ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ + ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \ +- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ + ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ - ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h -+ ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/AGfx.h ../../xpdf/poly.h ../../xpdf/TextOutputDev.h \ -+ ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h ../../xpdf/AComm.h ++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \ @@ -732,20 +964,21 @@ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/XOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/XOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \ ../../xpdf/poly.h poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h +md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \ + ../../xpdf/config.h +rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h -diff -u -b -B -w -r -N xpdf-0.80.orig/buildppc/xpdf/Makefile xpdf-0.80-decrypt/buildppc/xpdf/Makefile ---- xpdf-0.80.orig/buildppc/xpdf/Makefile Wed Jun 9 21:26:23 1999 -+++ xpdf-0.80-decrypt/buildppc/xpdf/Makefile Wed Jun 9 21:03:24 1999 -@@ -67,7 +67,10 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/buildppc/xpdf/Makefile xpdf-0.80-decrypt/buildppc/xpdf/Makefile +--- xpdf-0.80.orig/buildppc/xpdf/Makefile Fri Jun 25 18:27:50 1999 ++++ xpdf-0.80-decrypt/buildppc/xpdf/Makefile Fri Jun 25 19:39:49 1999 +@@ -68,7 +68,10 @@ $(srcdir)/FontOutputDev.cc \ $(srcdir)/AGfx.cc \ $(srcdir)/stub.cc \ @@ -757,9 +990,9 @@ #------------------------------------------------------------------------ -@@ -86,7 +89,8 @@ +@@ -87,7 +90,8 @@ TextOutputDev.o AOutputDev.o XRef.o apdfppcserv.o AGfx.o \ - GfxState.o Lexer.o Link.o Object.o OutputDev.o \ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ - apdfcommon.o ImageOutputDev.o poly.o FontOutputDev.o + apdfcommon.o ImageOutputDev.o poly.o FontOutputDev.o \ @@ -767,15 +1000,15 @@ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm Apdf.elf: $(APDF_OBJS) -@@ -111,106 +115,115 @@ +@@ -114,112 +118,119 @@ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ + ../../xpdf/rc4.h Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \ - ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h @@ -783,7 +1016,7 @@ + ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \ + ../../xpdf/Catalog.h Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ @@ -791,59 +1024,63 @@ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ - ../../xpdf/Lexer.h ../../xpdf/Parser.h ../../xpdf/GfxFont.h \ - ../../xpdf/GfxState.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ -- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Gfx.h -+ ../../xpdf/Gfx.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ ++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ + ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \ +- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \ +- ../../xpdf/Gfx.h ++ ../../xpdf/Params.h ../../xpdf/Gfx.h GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Error.h ../../xpdf/Params.h ../../xpdf/GfxFont.h \ -- ../../xpdf/FontInfo.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Params.h \ -+ ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \ +- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ ++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/GfxState.h -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/GfxState.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ -+ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/ImageOutputDev.h \ - ../../xpdf/OutputDev.h + ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \ +- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ ++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Link.h -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \ -+ ../../xpdf/Link.h + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Link.h ++ ../../xpdf/rc4.h ../../xpdf/Link.h Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -- ../../xpdf/XRef.h -+ ../../xpdf/rc4.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/XRef.h OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h - Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/GfxState.h ../../xpdf/OutputDev.h + Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ @@ -853,15 +1090,16 @@ + ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \ + ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -- ../../xpdf/Error.h ../../xpdf/config.h -+ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \ -+ ../../xpdf/rc4.h ../../xpdf/Parser.h ../../xpdf/Lexer.h \ -+ ../../xpdf/md5.h ../../xpdf/XRef.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \ +- ../../xpdf/config.h ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ ++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \ ++ ../../xpdf/XRef.h PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \ @@ -872,39 +1110,41 @@ ../../xpdf/OutputDev.h PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ -- ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/Error.h \ -- ../../xpdf/PDFDoc.h -+ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/Catalog.h \ -+ ../../xpdf/XRef.h ../../xpdf/Link.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/Params.h ../../xpdf/PDFDoc.h - PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ - ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \ -- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ -- ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ -- ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h +- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \ +- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \ +- ../../xpdf/Error.h ../../xpdf/PDFDoc.h + ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \ -+ ../../xpdf/GfxState.h ../../xpdf/GfxFont.h ../../xpdf/Catalog.h \ -+ ../../xpdf/Page.h ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h ++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h + PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \ + ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ +- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ +- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/OutputDev.h ++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \ ++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \ - ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/Stream-CCITT.h -+ ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h + ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h TextOutputDev.o: ../../xpdf/TextOutputDev.cc \ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/TextOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/TextOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/Object.h ../../xpdf/../goo/gtypes.h \ + ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h @@ -914,25 +1154,24 @@ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h \ ../../xpdf/AGfxcomm.h Apdfppcserv.o: ../../xpdf/Apdfppcserv.cc ../../xpdf/AComm.h \ -@@ -218,29 +231,33 @@ - Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \ +@@ -228,29 +239,32 @@ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \ - ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/Array.h \ -- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/XRef.h \ -+ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/Error.h \ -+ ../../xpdf/config.h ../../xpdf/rc4.h ../../xpdf/XRef.h \ - ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/Link.h \ -- ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/config.h \ -- ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ -- ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h ../../xpdf/TextOutputDev.h \ -+ ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/AGfx.h ../../xpdf/poly.h ../../xpdf/AComm.h \ -+ ../../xpdf/AGfxcomm.h ../../xpdf/TextOutputDev.h \ - ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \ -- ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h ../../xpdf/Error.h + ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ + ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ ++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \ + ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \ + ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \ +- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \ +- ../../xpdf/poly.h ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h \ +- ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \ +- ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \ +- ../../xpdf/GfxFont.h ../../xpdf/Error.h ++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \ ++ ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h ../../xpdf/TextOutputDev.h \ ++ ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \ + ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \ - ../../xpdf/../goo/GString.h ../../xpdf/Object.h \ + ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \ - ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \ - ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \ @@ -948,10 +1187,11 @@ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \ - ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \ -- ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ -+ ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ - ../../xpdf/XOutputFontInfo.h + ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \ +- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \ +- ../../xpdf/XOutputFontInfo.h ++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \ ++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \ ../../xpdf/poly.h ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h stub.o: ../../xpdf/stub.cc @@ -959,10 +1199,10 @@ +md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \ + ../../xpdf/config.h +rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h -diff -u -b -B -w -r -N xpdf-0.80.orig/buildsas/xpdf/SMakefile xpdf-0.80-decrypt/buildsas/xpdf/SMakefile ---- xpdf-0.80.orig/buildsas/xpdf/SMakefile Sat May 22 09:58:07 1999 -+++ xpdf-0.80-decrypt/buildsas/xpdf/SMakefile Wed Jun 9 20:54:38 1999 -@@ -66,7 +66,10 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/buildsas/xpdf/SMakefile xpdf-0.80-decrypt/buildsas/xpdf/SMakefile +--- xpdf-0.80.orig/buildsas/xpdf/SMakefile Thu Jun 24 18:20:30 1999 ++++ xpdf-0.80-decrypt/buildsas/xpdf/SMakefile Fri Jun 25 19:50:21 1999 +@@ -67,7 +67,10 @@ $(srcdir)/AOutputDev.cc \ $(srcdir)/FontOutputDev.cc \ $(srcdir)/AGfx.cc \ @@ -974,8 +1214,8 @@ #------------------------------------------------------------------------ -@@ -81,7 +84,7 @@ - GfxState.o Lexer.o Link.o Object.o OutputDev.o \ +@@ -82,7 +85,7 @@ + GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o stub.o \ - FontOutputDev.o @@ -983,9 +1223,202 @@ APDF_LIBS = lib /goo/goo.lib $(OTHERLIBS) Apdf: $(APDF_OBJS) -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/Makefile.in xpdf-0.80-decrypt/xpdf/Makefile.in +@@ -112,137 +115,149 @@ + Array.o: //xpdf/Array.cc //goo/gmem.h \ + //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h + Catalog.o: //xpdf/Catalog.cc //goo/gmem.h \ + //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Page.h //xpdf/Error.h \ +- //xpdf/config.h //xpdf/Link.h //xpdf/Catalog.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/Page.h //xpdf/Link.h \ ++ //xpdf/Catalog.h + Dict.o: //xpdf/Dict.cc //goo/gmem.h \ + //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/XRef.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/XRef.h + Error.o: //xpdf/Error.cc //goo/gtypes.h \ + //xpdf/Params.h //xpdf/Error.h //xpdf/config.h + Gfx.o: //xpdf/Gfx.cc //goo/gmem.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Lexer.h //xpdf/Parser.h \ ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/Lexer.h //xpdf/Parser.h \ + //xpdf/GfxFont.h //xpdf/GfxState.h //xpdf/OutputDev.h \ +- //xpdf/Params.h //xpdf/Error.h //xpdf/config.h \ +- //xpdf/Gfx.h ++ //xpdf/Params.h //xpdf/Gfx.h + GfxFont.o: //xpdf/GfxFont.cc //goo/GString.h \ + //goo/gmem.h //goo/gfile.h \ + //goo/gtypes.h //xpdf/config.h //xpdf/Object.h \ + //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Error.h //xpdf/Params.h \ +- //xpdf/GfxFont.h //xpdf/FontInfo.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/rc4.h \ ++ //xpdf/Params.h //xpdf/GfxFont.h //xpdf/FontInfo.h + GfxState.o: //xpdf/GfxState.cc //goo/gmem.h \ + //xpdf/Error.h //xpdf/config.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/GfxState.h ++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/GfxState.h + ImageOutputDev.o: //xpdf/ImageOutputDev.cc \ + //goo/gmem.h //xpdf/config.h //xpdf/Error.h \ + //xpdf/GfxState.h //goo/gtypes.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/GString.h //xpdf/Array.h \ +- //xpdf/Dict.h //xpdf/Stream.h //xpdf/ImageOutputDev.h \ +- //xpdf/OutputDev.h ++ //xpdf/Dict.h //xpdf/Stream.h //xpdf/rc4.h \ ++ //xpdf/ImageOutputDev.h //xpdf/OutputDev.h + Lexer.o: //xpdf/Lexer.cc //xpdf/Lexer.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/gmem.h //goo/GString.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ +- //xpdf/Error.h //xpdf/config.h ++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h + Link.o: //xpdf/Link.cc //goo/gmem.h \ + //goo/GString.h //xpdf/Error.h //xpdf/config.h \ + //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ +- //xpdf/Link.h ++ //xpdf/rc4.h //xpdf/Link.h + Object.o: //xpdf/Object.cc //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/gmem.h //goo/GString.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ +- //xpdf/Error.h //xpdf/config.h //xpdf/XRef.h ++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \ ++ //xpdf/XRef.h + OutputDev.o: //xpdf/OutputDev.cc //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/gmem.h //goo/GString.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ ++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \ + //xpdf/GfxState.h //xpdf/OutputDev.h + Page.o: //xpdf/Page.cc //xpdf/Object.h //xpdf/mystdio.h \ + //goo/gtypes.h //goo/gmem.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/XRef.h //xpdf/OutputDev.h \ +- //xpdf/Gfx.h //xpdf/Error.h //xpdf/config.h \ +- //xpdf/Params.h //xpdf/Page.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/XRef.h //xpdf/OutputDev.h \ ++ //xpdf/Gfx.h //xpdf/Params.h //xpdf/Page.h + Parser.o: //xpdf/Parser.cc //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/gmem.h //goo/GString.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ +- //xpdf/Parser.h //xpdf/Lexer.h //xpdf/Error.h \ +- //xpdf/config.h ++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \ ++ //xpdf/Parser.h //xpdf/Lexer.h //xpdf/md5.h \ ++ //xpdf/XRef.h + PBMOutputDev.o: //xpdf/PBMOutputDev.cc //goo/gmem.h \ + //goo/GString.h //xpdf/Object.h //xpdf/mystdio.h \ + //goo/gtypes.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/GfxState.h //xpdf/GfxFont.h \ +- //xpdf/Error.h //xpdf/config.h //xpdf/Params.h \ +- //xpdf/PBMOutputDev.h //xpdf/XOutputDev.h \ ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/GfxState.h //xpdf/GfxFont.h \ ++ //xpdf/Params.h //xpdf/PBMOutputDev.h //xpdf/XOutputDev.h \ + //xpdf/OutputDev.h + PDFDoc.o: //xpdf/PDFDoc.cc //goo/GString.h \ + //xpdf/config.h //xpdf/Page.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/gmem.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Catalog.h //xpdf/XRef.h \ +- //xpdf/Link.h //xpdf/OutputDev.h //xpdf/Params.h \ +- //xpdf/Error.h //xpdf/PDFDoc.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/rc4.h \ ++ //xpdf/Catalog.h //xpdf/XRef.h //xpdf/Link.h \ ++ //xpdf/OutputDev.h //xpdf/Params.h //xpdf/PDFDoc.h + PSOutputDev.o: //xpdf/PSOutputDev.cc //goo/GString.h \ + //xpdf/config.h //xpdf/Object.h //xpdf/mystdio.h \ + //goo/gtypes.h //goo/gmem.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ +- //xpdf/Error.h //xpdf/GfxState.h //xpdf/GfxFont.h \ +- //xpdf/Catalog.h //xpdf/Page.h //xpdf/PSOutputDev.h \ +- //xpdf/OutputDev.h ++ //xpdf/Error.h //xpdf/rc4.h //xpdf/GfxState.h \ ++ //xpdf/GfxFont.h //xpdf/Catalog.h //xpdf/Page.h \ ++ //xpdf/PSOutputDev.h //xpdf/OutputDev.h + Stream.o: //xpdf/Stream.cc //goo/gmem.h \ + //xpdf/config.h //xpdf/Error.h //xpdf/Object.h \ + //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Stream-CCITT.h ++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/Stream-CCITT.h + TextOutputDev.o: //xpdf/TextOutputDev.cc \ + //goo/GString.h //goo/gmem.h \ + //xpdf/config.h //xpdf/Error.h //xpdf/GfxState.h \ + //goo/gtypes.h //xpdf/GfxFont.h //xpdf/Object.h \ + //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/TextOutputDev.h //xpdf/OutputDev.h \ +- //xpdf/TextOutputFontInfo.h ++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/TextOutputDev.h \ ++ //xpdf/OutputDev.h //xpdf/TextOutputFontInfo.h + XRef.o: //xpdf/XRef.cc //goo/gmem.h \ + //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \ + //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/Lexer.h //xpdf/Parser.h \ +- //xpdf/Error.h //xpdf/config.h //xpdf/XRef.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/Lexer.h //xpdf/Parser.h \ ++ //xpdf/XRef.h //xpdf/md5.h + Apdf.o: //xpdf/Apdf.c //xpdf/config.h //xpdf/AComm.h + Apdfcommon.o: //xpdf/Apdfcommon.cc //goo/parseargs.h \ + //goo/gtypes.h //goo/GString.h \ + //goo/gmem.h //xpdf/Object.h //xpdf/mystdio.h \ + //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \ ++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \ + //xpdf/XRef.h //xpdf/Catalog.h //xpdf/Page.h \ + //xpdf/Link.h //xpdf/PDFDoc.h //xpdf/AOutputDev.h \ +- //xpdf/config.h //xpdf/OutputDev.h //xpdf/AGfx.h \ +- //xpdf/poly.h //xpdf/TextOutputDev.h //xpdf/PSOutputDev.h \ ++ //xpdf/OutputDev.h //xpdf/AGfx.h //xpdf/poly.h \ ++ //xpdf/TextOutputDev.h //xpdf/PSOutputDev.h \ + //xpdf/ImageOutputDev.h //xpdf/FontOutputDev.h \ +- //xpdf/GfxFont.h //xpdf/Error.h //xpdf/AComm.h ++ //xpdf/GfxFont.h //xpdf/AComm.h + AOutputDev.o: //xpdf/AOutputDev.cc //goo/gmem.h \ + //goo/GString.h //xpdf/Object.h //xpdf/mystdio.h \ + //goo/gtypes.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/GfxState.h //xpdf/GfxFont.h \ +- //xpdf/Error.h //xpdf/config.h //xpdf/TextOutputDev.h \ +- //xpdf/OutputDev.h //xpdf/AOutputDev.h //xpdf/AGfx.h \ +- //xpdf/poly.h //xpdf/FontOutputDev.h ++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \ ++ //xpdf/rc4.h //xpdf/GfxState.h //xpdf/GfxFont.h \ ++ //xpdf/TextOutputDev.h //xpdf/OutputDev.h \ ++ //xpdf/AOutputDev.h //xpdf/AGfx.h //xpdf/poly.h \ ++ //xpdf/FontOutputDev.h + FontOutputDev.o: //xpdf/FontOutputDev.cc \ + //goo/GString.h //goo/gmem.h \ + //xpdf/config.h //xpdf/Error.h //xpdf/GfxState.h \ + //goo/gtypes.h //xpdf/GfxFont.h //xpdf/Object.h \ + //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \ +- //xpdf/Stream.h //xpdf/FontOutputDev.h //xpdf/OutputDev.h \ +- //xpdf/XOutputFontInfo.h ++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/FontOutputDev.h \ ++ //xpdf/OutputDev.h //xpdf/XOutputFontInfo.h + AGfx.o: //xpdf/AGfx.cc //goo/gmem.h //xpdf/AGfx.h \ + //xpdf/poly.h + poly.o: //xpdf/poly.cc //xpdf/poly.h ++md5.o: //xpdf/md5.cc //xpdf/md5.h //xpdf/Error.h \ ++ //xpdf/config.h ++rc4.o: //xpdf/rc4.cc //xpdf/rc4.h +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/Makefile.in xpdf-0.80-decrypt/xpdf/Makefile.in --- xpdf-0.80.orig/xpdf/Makefile.in Tue Apr 27 18:54:12 1999 -+++ xpdf-0.80-decrypt/xpdf/Makefile.in Wed Jun 9 20:54:33 1999 ++++ xpdf-0.80-decrypt/xpdf/Makefile.in Fri Jun 25 18:43:43 1999 @@ -76,7 +76,7 @@ XPDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \ GfxState.o Lexer.o Link.o LTKOutputDev.o Object.o OutputDev.o \ @@ -1040,9 +1473,9 @@ PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm pdfimages$(EXE): $(PDFIMAGES_OBJS) -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/Parser.cc xpdf-0.80-decrypt/xpdf/Parser.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/Parser.cc xpdf-0.80-decrypt/xpdf/Parser.cc --- xpdf-0.80.orig/xpdf/Parser.cc Tue Apr 27 18:54:12 1999 -+++ xpdf-0.80-decrypt/xpdf/Parser.cc Wed Jun 9 20:54:33 1999 ++++ xpdf-0.80-decrypt/xpdf/Parser.cc Fri Jun 25 18:43:43 1999 @@ -16,6 +16,8 @@ #include "Dict.h" #include "Parser.h" @@ -1175,9 +1608,9 @@ + + return obj; } -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/Parser.h xpdf-0.80-decrypt/xpdf/Parser.h +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/Parser.h xpdf-0.80-decrypt/xpdf/Parser.h --- xpdf-0.80.orig/xpdf/Parser.h Tue Apr 27 18:54:12 1999 -+++ xpdf-0.80-decrypt/xpdf/Parser.h Wed Jun 9 20:54:33 1999 ++++ xpdf-0.80-decrypt/xpdf/Parser.h Fri Jun 25 18:43:43 1999 @@ -30,6 +30,8 @@ // Get the next object from the input stream. @@ -1187,9 +1620,9 @@ // Get stream. Stream *getStream() { return lexer->getStream(); } -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/Stream.cc xpdf-0.80-decrypt/xpdf/Stream.cc ---- xpdf-0.80.orig/xpdf/Stream.cc Tue Apr 27 20:04:03 1999 -+++ xpdf-0.80-decrypt/xpdf/Stream.cc Wed Jun 9 20:54:34 1999 +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/Stream.cc xpdf-0.80-decrypt/xpdf/Stream.cc +--- xpdf-0.80.orig/xpdf/Stream.cc Sun Jun 20 18:28:37 1999 ++++ xpdf-0.80-decrypt/xpdf/Stream.cc Fri Jun 25 18:43:44 1999 @@ -415,6 +415,7 @@ bufPos = start; savePos = -1; @@ -1200,7 +1633,7 @@ FileStream::~FileStream() { @@ -443,9 +444,19 @@ n = 256; - n = fread(buf, 1, n, f); + n = myfread(buf, 1, n, f); bufEnd = buf + n; + if (encryption == gTrue) { + rc4Crypt(&rc4Key, (unsigned char *)buf, n); @@ -1218,11 +1651,11 @@ } void FileStream::setPos(int pos1) { -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/Stream.h xpdf-0.80-decrypt/xpdf/Stream.h ---- xpdf-0.80.orig/xpdf/Stream.h Tue Apr 27 20:02:04 1999 -+++ xpdf-0.80-decrypt/xpdf/Stream.h Wed Jun 9 20:54:34 1999 -@@ -16,6 +16,8 @@ - #include +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/Stream.h xpdf-0.80-decrypt/xpdf/Stream.h +--- xpdf-0.80.orig/xpdf/Stream.h Sun Jun 20 16:33:20 1999 ++++ xpdf-0.80-decrypt/xpdf/Stream.h Fri Jun 25 18:46:28 1999 +@@ -17,6 +17,8 @@ + #include "mystdio.h" #include "gtypes.h" #include "Object.h" +#include "Error.h" @@ -1230,7 +1663,7 @@ //------------------------------------------------------------------------ -@@ -104,6 +106,8 @@ +@@ -105,6 +107,8 @@ // Returns the new stream. Stream *addFilters(Object *dict); @@ -1239,7 +1672,7 @@ private: Stream *makeFilter(char *name, Stream *str, Object *params); -@@ -156,8 +160,12 @@ +@@ -157,8 +161,12 @@ private: @@ -1249,12 +1682,12 @@ + RC4KEY rc4Key; + GBool encryption; - FILE *f; + myFILE *f; int start; int length; -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/XRef.cc xpdf-0.80-decrypt/xpdf/XRef.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/XRef.cc xpdf-0.80-decrypt/xpdf/XRef.cc --- xpdf-0.80.orig/xpdf/XRef.cc Tue Apr 27 18:54:13 1999 -+++ xpdf-0.80-decrypt/xpdf/XRef.cc Wed Jun 9 20:54:35 1999 ++++ xpdf-0.80-decrypt/xpdf/XRef.cc Fri Jun 25 18:43:45 1999 @@ -22,6 +22,8 @@ #include "Dict.h" #include "Error.h" @@ -1497,10 +1930,10 @@ + preparedPassword->append(&acFill[0], 32); + return gTrue; } -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/XRef.h xpdf-0.80-decrypt/xpdf/XRef.h ---- xpdf-0.80.orig/xpdf/XRef.h Tue Apr 27 18:54:14 1999 -+++ xpdf-0.80-decrypt/xpdf/XRef.h Wed Jun 9 20:54:35 1999 -@@ -43,15 +43,20 @@ +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/XRef.h xpdf-0.80-decrypt/xpdf/XRef.h +--- xpdf-0.80.orig/xpdf/XRef.h Sun Jun 20 16:26:50 1999 ++++ xpdf-0.80-decrypt/xpdf/XRef.h Fri Jun 25 18:43:46 1999 +@@ -44,15 +44,20 @@ GBool isOk() { return ok; } // Is the file encrypted? @@ -1522,7 +1955,7 @@ // Fetch an indirect reference. Object *fetch(int num, int gen, Object *obj); -@@ -68,6 +73,19 @@ +@@ -69,6 +74,19 @@ int rootNum, rootGen; // catalog dict GBool ok; // true if xref table is valid Object trailerDict; // trailer dictionary @@ -1542,9 +1975,9 @@ int readTrailer(FileStream *str); GBool readXRef(FileStream *str, int *pos); -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/config.h xpdf-0.80-decrypt/xpdf/config.h ---- xpdf-0.80.orig/xpdf/config.h Tue Apr 27 21:54:36 1999 -+++ xpdf-0.80-decrypt/xpdf/config.h Wed Jun 9 20:54:35 1999 +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/config.h xpdf-0.80-decrypt/xpdf/config.h +--- xpdf-0.80.orig/xpdf/config.h Thu Jun 24 18:47:06 1999 ++++ xpdf-0.80-decrypt/xpdf/config.h Fri Jun 25 18:48:23 1999 @@ -4,6 +4,9 @@ // // Copyright 1996 Derek B. Noonburg @@ -1555,17 +1988,18 @@ //======================================================================== #ifndef CONFIG_H -@@ -14,14 +17,15 @@ +@@ -14,8 +17,8 @@ //------------------------------------------------------------------------ // xpdf version -#define xpdfVersion "0.80" --#define apdfVersion "1.1" +-#define apdfVersion "1.2" +#define xpdfVersion "0.80 (decryption)" -+#define apdfVersion "1.1 (decryption)" ++#define apdfVersion "1.2 (decryption)" + #define apdfVerString "Apdf 1.2 (24.6.99)" // supported PDF version - #define pdfVersion "1.2" +@@ -23,6 +26,7 @@ #define pdfVersionNum 1.2 // copyright notice #define xpdfCopyright "Copyright \251 1996-1998 Derek B. Noonburg" @@ -1573,84 +2007,9 @@ // default paper size (in points) for PostScript output #ifdef A4_PAPER -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/config.h.orig xpdf-0.80-decrypt/xpdf/config.h.orig ---- xpdf-0.80.orig/xpdf/config.h.orig Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/xpdf/config.h.orig Tue Apr 27 21:54:36 1999 -@@ -0,0 +1,71 @@ -+//======================================================================== -+// -+// config.h -+// -+// Copyright 1996 Derek B. Noonburg -+// -+//======================================================================== -+ -+#ifndef CONFIG_H -+#define CONFIG_H -+ -+//------------------------------------------------------------------------ -+// general constants -+//------------------------------------------------------------------------ -+ -+// xpdf version -+#define xpdfVersion "0.80" -+#define apdfVersion "1.1" -+ -+// supported PDF version -+#define pdfVersion "1.2" -+#define pdfVersionNum 1.2 -+// copyright notice -+#define xpdfCopyright "Copyright \251 1996-1998 Derek B. Noonburg" -+ -+// default paper size (in points) for PostScript output -+#ifdef A4_PAPER -+#define defPaperWidth 595 // ISO A4 (210x297 mm) -+#define defPaperHeight 842 -+#else -+#define defPaperWidth 612 // American letter (8.5x11") -+#define defPaperHeight 792 -+#endif -+ -+// config file name -+#if defined(VMS) || defined(__EMX__) -+#define xpdfConfigFile "xpdfrc" -+#else -+#define xpdfConfigFile ".xpdfrc" -+#endif -+ -+//------------------------------------------------------------------------ -+// X-related constants -+//------------------------------------------------------------------------ -+ -+// default maximum size of color cube to allocate -+#define defaultRGBCube 5 -+ -+// number of fonts to cache -+#define fontCacheSize 32 -+ -+//------------------------------------------------------------------------ -+// uncompress program -+//------------------------------------------------------------------------ -+ -+extern const char *uncompressCmd; -+ -+//------------------------------------------------------------------------ -+// Win32 stuff -+//------------------------------------------------------------------------ -+ -+#ifdef WIN32 -+#ifdef CDECL -+#undef CDECL -+#endif -+#define CDECL __cdecl -+#else -+#define CDECL -+#endif -+ -+#endif -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/md5.cc xpdf-0.80-decrypt/xpdf/md5.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/md5.cc xpdf-0.80-decrypt/xpdf/md5.cc --- xpdf-0.80.orig/xpdf/md5.cc Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/xpdf/md5.cc Wed Jun 9 20:54:36 1999 ++++ xpdf-0.80-decrypt/xpdf/md5.cc Fri Jun 25 18:44:50 1999 @@ -0,0 +1,544 @@ +// MD5.CC - source code for the C++/object oriented translation and +// modification of MD5. @@ -2196,9 +2555,9 @@ + a += I(b, c, d) + x + ac; + a = rotate_left (a, s) +b; +} -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/md5.h xpdf-0.80-decrypt/xpdf/md5.h +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/md5.h xpdf-0.80-decrypt/xpdf/md5.h --- xpdf-0.80.orig/xpdf/md5.h Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/xpdf/md5.h Wed Jun 9 20:54:36 1999 ++++ xpdf-0.80-decrypt/xpdf/md5.h Fri Jun 25 18:44:51 1999 @@ -0,0 +1,109 @@ +// MD5.CC - source code for the C++/object oriented translation and +// modification of MD5. @@ -2309,9 +2668,9 @@ + uint4 s, uint4 ac); + +}; -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/pdftops.cc xpdf-0.80-decrypt/xpdf/pdftops.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/pdftops.cc xpdf-0.80-decrypt/xpdf/pdftops.cc --- xpdf-0.80.orig/xpdf/pdftops.cc Tue Apr 27 18:54:22 1999 -+++ xpdf-0.80-decrypt/xpdf/pdftops.cc Wed Jun 9 20:54:36 1999 ++++ xpdf-0.80-decrypt/xpdf/pdftops.cc Fri Jun 25 18:44:51 1999 @@ -68,6 +68,7 @@ if (!ok || argc < 2 || argc > 3 || printHelp) { fprintf(stderr, "pdftops version %s\n", xpdfVersion); @@ -2320,9 +2679,9 @@ printUsage("pdftops", " []", argDesc); exit(1); } -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/pdftotext.cc xpdf-0.80-decrypt/xpdf/pdftotext.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/pdftotext.cc xpdf-0.80-decrypt/xpdf/pdftotext.cc --- xpdf-0.80.orig/xpdf/pdftotext.cc Tue Apr 27 18:54:22 1999 -+++ xpdf-0.80-decrypt/xpdf/pdftotext.cc Wed Jun 9 20:54:36 1999 ++++ xpdf-0.80-decrypt/xpdf/pdftotext.cc Fri Jun 25 18:44:51 1999 @@ -59,6 +59,7 @@ if (!ok || argc < 2 || argc > 3 || printHelp) { fprintf(stderr, "pdftotext version %s\n", xpdfVersion); @@ -2331,9 +2690,9 @@ printUsage("pdftotext", " []", argDesc); exit(1); } -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/rc4.cc xpdf-0.80-decrypt/xpdf/rc4.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/rc4.cc xpdf-0.80-decrypt/xpdf/rc4.cc --- xpdf-0.80.orig/xpdf/rc4.cc Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/xpdf/rc4.cc Wed Jun 9 20:54:37 1999 ++++ xpdf-0.80-decrypt/xpdf/rc4.cc Fri Jun 25 18:44:51 1999 @@ -0,0 +1,70 @@ +/************************************************************************ + * * @@ -2405,9 +2764,9 @@ + rc4->x = x; + rc4->y = y; +} -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/rc4.h xpdf-0.80-decrypt/xpdf/rc4.h +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/rc4.h xpdf-0.80-decrypt/xpdf/rc4.h --- xpdf-0.80.orig/xpdf/rc4.h Thu Jan 1 00:00:00 1970 -+++ xpdf-0.80-decrypt/xpdf/rc4.h Wed Jun 9 20:54:37 1999 ++++ xpdf-0.80-decrypt/xpdf/rc4.h Fri Jun 25 18:44:52 1999 @@ -0,0 +1,25 @@ +#include + @@ -2434,9 +2793,9 @@ +void rc4ExpandKey( RC4KEY *rc4, unsigned char const *key, int keylen ); +void rc4Crypt( RC4KEY *rc4, unsigned char *data, int len ); +#endif -diff -u -b -B -w -r -N xpdf-0.80.orig/xpdf/xpdf.cc xpdf-0.80-decrypt/xpdf/xpdf.cc +diff -u -b -B -r -N -w xpdf-0.80.orig/xpdf/xpdf.cc xpdf-0.80-decrypt/xpdf/xpdf.cc --- xpdf-0.80.orig/xpdf/xpdf.cc Tue Apr 27 18:54:23 1999 -+++ xpdf-0.80-decrypt/xpdf/xpdf.cc Wed Jun 9 20:54:37 1999 ++++ xpdf-0.80-decrypt/xpdf/xpdf.cc Fri Jun 25 18:44:52 1999 @@ -334,6 +334,7 @@ if (!ok || printHelp) { fprintf(stderr, "xpdf version %s\n", xpdfVersion);