From 29bfa42432b9c0eba182531593aff48f20d46e95 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 12 May 2009 08:47:53 +0000 Subject: remove xpdf patches not needed for pdfTeX/luaTeX/XeTeX git-svn-id: svn://tug.org/texlive/trunk@13050 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog | 7 + .../xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct | 40 ------ .../libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt | 50 ------- .../xpdf-3.02-PATCHES/patch-23-exclude-keyBindings | 156 --------------------- Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h | 5 +- .../libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc | 12 -- .../source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h | 10 -- Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h | 13 +- Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h | 4 - 9 files changed, 12 insertions(+), 285 deletions(-) delete mode 100644 Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct delete mode 100644 Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt delete mode 100644 Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-23-exclude-keyBindings (limited to 'Build/source/libs') diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog index 53e072de623..14881ff72be 100644 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog +++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog @@ -1,3 +1,10 @@ +2009-05-12 Peter Breitenlohner + + * patch-16-size-of-struct (removed): unnecessary. + * patch-17-strCrypt (removed): was never useful. + * patch-23-exclude-keyBindings (removed): has removed lots of + unused code, but may be problematic with future foolabs updates. + 2009-05-11 Peter Breitenlohner * patch-10-exclude-body-of-Page::getDefaultCTM (removed), diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct deleted file mode 100644 index 8dee7f1f297..00000000000 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct +++ /dev/null @@ -1,40 +0,0 @@ - Not needed, DISABLE_OUTLINE is no longer used in pdftex sources, - but might be nevertheless useful. - - from: - Han The Thanh - Martin Schroeder - -diff -ur -N xpdf-3.02.orig/xpdf/PDFDoc.h xpdf-3.02/xpdf/PDFDoc.h ---- xpdf-3.02.orig/xpdf/PDFDoc.h 2007-02-27 23:05:52.000000000 +0100 -+++ xpdf-3.02/xpdf/PDFDoc.h 2008-07-17 02:29:04.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 1996-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #ifndef PDFDOC_H - #define PDFDOC_H -@@ -171,13 +174,15 @@ - double pdfVersion; - XRef *xref; - Catalog *catalog; -+ GBool ok; -+ int errCode; -+/* Keep the size of the structure the same whether DISABLE_OUTLINE or -+ not, and put it last to try to find errors more quickly. */ - #ifndef DISABLE_OUTLINE - Outline *outline; -+#else -+ void *dummy; - #endif -- -- -- GBool ok; -- int errCode; - }; - - #endif diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt deleted file mode 100644 index d6bd42725b7..00000000000 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt +++ /dev/null @@ -1,50 +0,0 @@ - I don't know why this is needed. The pdfTeX svn log says - "Import libpng 1.2.24 into stable". ??? - - from: - Han The Thanh - Martin Schroeder - -diff -ur -N xpdf-3.02.orig/xpdf/Decrypt.h xpdf-3.02/xpdf/Decrypt.h ---- xpdf-3.02.orig/xpdf/Decrypt.h 2007-02-27 23:05:52.000000000 +0100 -+++ xpdf-3.02/xpdf/Decrypt.h 2008-05-08 15:40:41.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 1996-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #ifndef DECRYPT_H - #define DECRYPT_H -@@ -73,7 +76,7 @@ - CryptAlgorithm algoA, int keyLength, - int objNum, int objGen); - virtual ~DecryptStream(); -- virtual StreamKind getKind() { return strWeird; } -+ virtual StreamKind getKind() { return strCrypt; } - virtual void reset(); - virtual int getChar(); - virtual int lookChar(); -diff -ur -N xpdf-3.02.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h ---- xpdf-3.02.orig/xpdf/Stream.h 2007-11-12 13:27:21.000000000 +0100 -+++ xpdf-3.02/xpdf/Stream.h 2008-05-08 15:40:41.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 1996-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #ifndef STREAM_H - #define STREAM_H -@@ -34,6 +37,7 @@ - strFlate, - strJBIG2, - strJPX, -+ strCrypt, - strWeird // internal-use stream types - }; - diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-23-exclude-keyBindings b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-23-exclude-keyBindings deleted file mode 100644 index c1de3c7837c..00000000000 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-23-exclude-keyBindings +++ /dev/null @@ -1,156 +0,0 @@ - Patches for pdfTeX / luaTeX / XeTeX - - from: - Han The Thanh - -diff -ur -N xpdf-3.02.orig/xpdf/GlobalParams.cc xpdf-3.02/xpdf/GlobalParams.cc ---- xpdf-3.02.orig/xpdf/GlobalParams.cc 2009-05-10 13:01:34.000000000 +0200 -+++ xpdf-3.02/xpdf/GlobalParams.cc 2009-05-10 13:16:03.000000000 +0200 -@@ -429,6 +429,7 @@ - } - } - -+#ifndef PDF_PARSER_ONLY - //------------------------------------------------------------------------ - // KeyBinding - //------------------------------------------------------------------------ -@@ -461,6 +462,7 @@ - KeyBinding::~KeyBinding() { - deleteGList(cmds, GString); - } -+#endif /* !PDF_PARSER_ONLY */ - - #ifdef ENABLE_PLUGINS - //------------------------------------------------------------------------ -@@ -718,7 +720,9 @@ - movieCommand = NULL; - mapNumericCharNames = gTrue; - mapUnknownCharNames = gFalse; -+#ifndef PDF_PARSER_ONLY - createDefaultKeyBindings(); -+#endif - printCommands = gFalse; - errQuiet = gFalse; - -@@ -801,6 +805,7 @@ - #endif /* !PDF_PARSER_ONLY */ - } - -+#ifndef PDF_PARSER_ONLY - void GlobalParams::createDefaultKeyBindings() { - keyBindings = new GList(); - -@@ -1127,6 +1132,7 @@ - - deleteGList(tokens, GString); - } -+#endif /* !PDF_PARSER_ONLY */ - - void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName, - int line) { -@@ -1471,6 +1477,7 @@ - } - } - -+#ifndef PDF_PARSER_ONLY - void GlobalParams::parseBind(GList *tokens, GString *fileName, int line) { - KeyBinding *binding; - GList *cmds; -@@ -1656,6 +1663,7 @@ - - return gTrue; - } -+#endif /* !PDF_PARSER_ONLY */ - - void GlobalParams::parseCommand(char *cmdName, GString **val, - GList *tokens, GString *fileName, int line) { -@@ -1799,7 +1807,9 @@ - if (movieCommand) { - delete movieCommand; - } -+#ifndef PDF_PARSER_ONLY - deleteGList(keyBindings, KeyBinding); -+#endif - - cMapDirs->startIter(&iter); - while (cMapDirs->getNext(&iter, &key, (void **)&list)) { -@@ -2450,6 +2460,7 @@ - return map; - } - -+#ifndef PDF_PARSER_ONLY - GList *GlobalParams::getKeyBinding(int code, int mods, int context) { - KeyBinding *binding; - GList *cmds; -@@ -2475,6 +2486,7 @@ - unlockGlobalParams; - return cmds; - } -+#endif /* !PDF_PARSER_ONLY */ - - GBool GlobalParams::getPrintCommands() { - GBool p; -diff -ur -N xpdf-3.02.orig/xpdf/GlobalParams.h xpdf-3.02/xpdf/GlobalParams.h ---- xpdf-3.02.orig/xpdf/GlobalParams.h 2009-05-10 13:01:46.000000000 +0200 -+++ xpdf-3.02/xpdf/GlobalParams.h 2009-05-10 13:16:03.000000000 +0200 -@@ -126,6 +126,7 @@ - - //------------------------------------------------------------------------ - -+#ifndef PDF_PARSER_ONLY - class KeyBinding { - public: - -@@ -189,6 +190,7 @@ - #define xpdfKeyContextMainWin (2 << 6) - #define xpdfKeyContextScrLockOn (1 << 8) - #define xpdfKeyContextScrLockOff (2 << 8) -+#endif /* !PDF_PARSER_ONLY */ - - //------------------------------------------------------------------------ - -@@ -264,7 +266,9 @@ - GString *getMovieCommand() { return movieCommand; } - GBool getMapNumericCharNames(); - GBool getMapUnknownCharNames(); -+#ifndef PDF_PARSER_ONLY - GList *getKeyBinding(int code, int mods, int context); -+#endif - GBool getPrintCommands(); - GBool getErrQuiet(); - -@@ -323,7 +327,9 @@ - - private: - -+#ifndef PDF_PARSER_ONLY - void createDefaultKeyBindings(); -+#endif - void parseFile(GString *fileName, FILE *f); - void parseNameToUnicode(GList *tokens, GString *fileName, int line); - void parseCIDToUnicode(GList *tokens, GString *fileName, int line); -@@ -346,12 +352,14 @@ - void parseFontDir(GList *tokens, GString *fileName, int line); - void parseInitialZoom(GList *tokens, GString *fileName, int line); - void parseScreenType(GList *tokens, GString *fileName, int line); -+#ifndef PDF_PARSER_ONLY - void parseBind(GList *tokens, GString *fileName, int line); - void parseUnbind(GList *tokens, GString *fileName, int line); - GBool parseKey(GString *modKeyStr, GString *contextStr, - int *code, int *mods, int *context, - char *cmdName, - GList *tokens, GString *fileName, int line); -+#endif - void parseCommand(char *cmdName, GString **val, - GList *tokens, GString *fileName, int line); - void parseYesNo(char *cmdName, GBool *flag, -@@ -446,7 +454,9 @@ - GString *movieCommand; // command executed for movie annotations - GBool mapNumericCharNames; // map numeric char names (from font subsets)? - GBool mapUnknownCharNames; // map unknown char names? -+#ifndef PDF_PARSER_ONLY - GList *keyBindings; // key & mouse button bindings [KeyBinding] -+#endif - GBool printCommands; // print the drawing commands - GBool errQuiet; // suppress error messages? - diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h index 14cdaacca7b..56f34b77f26 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h @@ -5,9 +5,6 @@ // Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== -// Modified for TeX Live by Peter Breitenlohner -// See top-level ChangeLog for a list of all modifications -//======================================================================== #ifndef DECRYPT_H #define DECRYPT_H @@ -76,7 +73,7 @@ public: CryptAlgorithm algoA, int keyLength, int objNum, int objGen); virtual ~DecryptStream(); - virtual StreamKind getKind() { return strCrypt; } + virtual StreamKind getKind() { return strWeird; } virtual void reset(); virtual int getChar(); virtual int lookChar(); diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc index d701803e33a..2b496218314 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc @@ -429,7 +429,6 @@ PSFontParam::~PSFontParam() { } } -#ifndef PDF_PARSER_ONLY //------------------------------------------------------------------------ // KeyBinding //------------------------------------------------------------------------ @@ -462,7 +461,6 @@ KeyBinding::KeyBinding(int codeA, int modsA, int contextA, GList *cmdsA) { KeyBinding::~KeyBinding() { deleteGList(cmds, GString); } -#endif /* !PDF_PARSER_ONLY */ #ifdef ENABLE_PLUGINS //------------------------------------------------------------------------ @@ -720,9 +718,7 @@ GlobalParams::GlobalParams(char *cfgFileName) { movieCommand = NULL; mapNumericCharNames = gTrue; mapUnknownCharNames = gFalse; -#ifndef PDF_PARSER_ONLY createDefaultKeyBindings(); -#endif printCommands = gFalse; errQuiet = gFalse; @@ -805,7 +801,6 @@ GlobalParams::GlobalParams(char *cfgFileName) { #endif /* !PDF_PARSER_ONLY */ } -#ifndef PDF_PARSER_ONLY void GlobalParams::createDefaultKeyBindings() { keyBindings = new GList(); @@ -1132,7 +1127,6 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) { deleteGList(tokens, GString); } -#endif /* !PDF_PARSER_ONLY */ void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName, int line) { @@ -1477,7 +1471,6 @@ void GlobalParams::parseScreenType(GList *tokens, GString *fileName, } } -#ifndef PDF_PARSER_ONLY void GlobalParams::parseBind(GList *tokens, GString *fileName, int line) { KeyBinding *binding; GList *cmds; @@ -1663,7 +1656,6 @@ GBool GlobalParams::parseKey(GString *modKeyStr, GString *contextStr, return gTrue; } -#endif /* !PDF_PARSER_ONLY */ void GlobalParams::parseCommand(char *cmdName, GString **val, GList *tokens, GString *fileName, int line) { @@ -1807,9 +1799,7 @@ GlobalParams::~GlobalParams() { if (movieCommand) { delete movieCommand; } -#ifndef PDF_PARSER_ONLY deleteGList(keyBindings, KeyBinding); -#endif cMapDirs->startIter(&iter); while (cMapDirs->getNext(&iter, &key, (void **)&list)) { @@ -2460,7 +2450,6 @@ GBool GlobalParams::getMapUnknownCharNames() { return map; } -#ifndef PDF_PARSER_ONLY GList *GlobalParams::getKeyBinding(int code, int mods, int context) { KeyBinding *binding; GList *cmds; @@ -2486,7 +2475,6 @@ GList *GlobalParams::getKeyBinding(int code, int mods, int context) { unlockGlobalParams; return cmds; } -#endif /* !PDF_PARSER_ONLY */ GBool GlobalParams::getPrintCommands() { GBool p; diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h index b57a1698d3f..5aa7018c09a 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h @@ -126,7 +126,6 @@ enum ScreenType { //------------------------------------------------------------------------ -#ifndef PDF_PARSER_ONLY class KeyBinding { public: @@ -190,7 +189,6 @@ public: #define xpdfKeyContextMainWin (2 << 6) #define xpdfKeyContextScrLockOn (1 << 8) #define xpdfKeyContextScrLockOff (2 << 8) -#endif /* !PDF_PARSER_ONLY */ //------------------------------------------------------------------------ @@ -266,9 +264,7 @@ public: GString *getMovieCommand() { return movieCommand; } GBool getMapNumericCharNames(); GBool getMapUnknownCharNames(); -#ifndef PDF_PARSER_ONLY GList *getKeyBinding(int code, int mods, int context); -#endif GBool getPrintCommands(); GBool getErrQuiet(); @@ -327,9 +323,7 @@ public: private: -#ifndef PDF_PARSER_ONLY void createDefaultKeyBindings(); -#endif void parseFile(GString *fileName, FILE *f); void parseNameToUnicode(GList *tokens, GString *fileName, int line); void parseCIDToUnicode(GList *tokens, GString *fileName, int line); @@ -352,14 +346,12 @@ private: void parseFontDir(GList *tokens, GString *fileName, int line); void parseInitialZoom(GList *tokens, GString *fileName, int line); void parseScreenType(GList *tokens, GString *fileName, int line); -#ifndef PDF_PARSER_ONLY void parseBind(GList *tokens, GString *fileName, int line); void parseUnbind(GList *tokens, GString *fileName, int line); GBool parseKey(GString *modKeyStr, GString *contextStr, int *code, int *mods, int *context, char *cmdName, GList *tokens, GString *fileName, int line); -#endif void parseCommand(char *cmdName, GString **val, GList *tokens, GString *fileName, int line); void parseYesNo(char *cmdName, GBool *flag, @@ -454,9 +446,7 @@ private: GString *movieCommand; // command executed for movie annotations GBool mapNumericCharNames; // map numeric char names (from font subsets)? GBool mapUnknownCharNames; // map unknown char names? -#ifndef PDF_PARSER_ONLY GList *keyBindings; // key & mouse button bindings [KeyBinding] -#endif GBool printCommands; // print the drawing commands GBool errQuiet; // suppress error messages? diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h index 792d37ab18c..208b61efa97 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h @@ -5,9 +5,6 @@ // Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== -// Modified for TeX Live by Peter Breitenlohner -// See top-level ChangeLog for a list of all modifications -//======================================================================== #ifndef PDFDOC_H #define PDFDOC_H @@ -174,15 +171,13 @@ private: double pdfVersion; XRef *xref; Catalog *catalog; - GBool ok; - int errCode; -/* Keep the size of the structure the same whether DISABLE_OUTLINE or - not, and put it last to try to find errors more quickly. */ #ifndef DISABLE_OUTLINE Outline *outline; -#else - void *dummy; #endif + + + GBool ok; + int errCode; }; #endif diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h index ef592eb0927..0bf791106ac 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h @@ -5,9 +5,6 @@ // Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== -// Modified for TeX Live by Peter Breitenlohner -// See top-level ChangeLog for a list of all modifications -//======================================================================== #ifndef STREAM_H #define STREAM_H @@ -37,7 +34,6 @@ enum StreamKind { strFlate, strJBIG2, strJPX, - strCrypt, strWeird // internal-use stream types }; -- cgit v1.2.3