diff options
| -rw-r--r-- | ALL_DIFF | 31 |
1 files changed, 0 insertions, 31 deletions
@@ -9325,7 +9325,6 @@ diff -ru xpdf-3.02/xpdf/GfxFont.cc xpdf-3.03/xpdf/GfxFont.cc tag = new GString(tagA);
id = idA;
name = nameA;
-- origName = nameA;
+ type = typeA;
+ embFontID = embFontIDA;
embFontName = NULL;
@@ -9334,9 +9333,6 @@ diff -ru xpdf-3.02/xpdf/GfxFont.cc xpdf-3.03/xpdf/GfxFont.cc GfxFont::~GfxFont() {
delete tag;
-- if (origName && origName != name) {
-- delete origName;
-- }
if (name) {
delete name;
}
@@ -10428,20 +10424,6 @@ diff -ru xpdf-3.02/xpdf/GfxFont.h xpdf-3.03/xpdf/GfxFont.h virtual ~GfxFont();
-@@ -106,12 +143,9 @@
- // Does this font match the tag?
- GBool matches(char *tagA) { return !tag->cmp(tagA); }
-
-- // Get base font name.
-- GString *getName() { return name; }
--
- // Get the original font name (ignornig any munging that might have
- // been done to map to a canonical Base-14 font name).
-- GString *getOrigName() { return origName; }
-+ GString *getName() { return name; }
-
- // Get font type.
- GfxFontType getType() { return type; }
@@ -126,10 +160,6 @@
// NULL if there is no embedded font.
GString *getEmbeddedFontName() { return embFontName; }
@@ -10484,7 +10466,6 @@ diff -ru xpdf-3.02/xpdf/GfxFont.h xpdf-3.03/xpdf/GfxFont.h GString *tag; // PDF font tag
Ref id; // reference (used as unique ID)
GString *name; // font name
-- GString *origName; // original font name
GfxFontType type; // type of font
int flags; // font descriptor flags
GString *embFontName; // name of embedded font
@@ -19098,18 +19079,6 @@ diff -ru xpdf-3.02/xpdf/SplashOutputDev.h xpdf-3.03/xpdf/SplashOutputDev.h diff -ru xpdf-3.02/xpdf/TextOutputDev.cc xpdf-3.03/xpdf/TextOutputDev.cc
--- xpdf-3.02/xpdf/TextOutputDev.cc 2007-02-27 23:05:52.000000000 +0100
+++ xpdf-3.03/xpdf/TextOutputDev.cc 2011-08-15 23:08:53.000000000 +0200
-@@ -172,9 +172,8 @@
- TextFontInfo::TextFontInfo(GfxState *state) {
- gfxFont = state->getFont();
- #if TEXTOUT_WORD_LIST
-- fontName = (gfxFont && gfxFont->getOrigName())
-- ? gfxFont->getOrigName()->copy()
-- : (GString *)NULL;
-+ fontName = (gfxFont && gfxFont->getName()) ? gfxFont->getName()->copy()
-+ : (GString *)NULL;
- flags = gfxFont ? gfxFont->getFlags() : 0;
- #endif
- }
@@ -196,73 +195,102 @@
//------------------------------------------------------------------------
|