diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-12 08:47:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-12 08:47:53 +0000 |
commit | 29bfa42432b9c0eba182531593aff48f20d46e95 (patch) | |
tree | bb059a5a04cfa4f182b69ce83e6d06b2c72528e4 /Build/source/libs/xpdf/xpdf-3.02 | |
parent | ff3aa9f7be6866626ae86309a162faa69b6046ac (diff) |
remove xpdf patches not needed for pdfTeX/luaTeX/XeTeX
git-svn-id: svn://tug.org/texlive/trunk@13050 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-3.02')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h | 5 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc | 12 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h | 10 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h | 13 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h | 4 |
5 files changed, 5 insertions, 39 deletions
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 <tex-live@tug.org> -// 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 <tex-live@tug.org> -// 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 <tex-live@tug.org> -// 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 }; |