summaryrefslogtreecommitdiff
path: root/ALL_DIFF
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-10-20 00:45:40 +0200
committerAlbert Astals Cid <aacid@kde.org>2011-10-20 00:45:40 +0200
commit646efe0e44b666265e2ea36783c5675c5f196db8 (patch)
tree13c746b95700c8533175c6bbf4d747258ef73ca6 /ALL_DIFF
parent39e83f32bbab6eb2cbacbd11b3688b64356f8b1f (diff)
xpdf303: GfxFontLoc
Diffstat (limited to 'ALL_DIFF')
-rw-r--r--ALL_DIFF42
1 files changed, 0 insertions, 42 deletions
diff --git a/ALL_DIFF b/ALL_DIFF
index db49d8d..9ee8bb5 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -10418,48 +10418,6 @@ diff -ru xpdf-3.02/xpdf/GfxFont.cc xpdf-3.03/xpdf/GfxFont.cc
diff -ru xpdf-3.02/xpdf/GfxFont.h xpdf-3.03/xpdf/GfxFont.h
--- xpdf-3.02/xpdf/GfxFont.h 2007-02-27 23:05:52.000000000 +0100
+++ xpdf-3.03/xpdf/GfxFont.h 2011-08-15 23:08:53.000000000 +0200
-@@ -76,6 +77,41 @@
- };
-
- //------------------------------------------------------------------------
-+// GfxFontLoc
-+//------------------------------------------------------------------------
-+
-+enum GfxFontLocType {
-+ gfxFontLocEmbedded, // font embedded in PDF file
-+ gfxFontLocExternal, // external font file
-+ gfxFontLocResident // font resident in PS printer
-+};
-+
-+class GfxFontLoc {
-+public:
-+
-+ GfxFontLoc();
-+ ~GfxFontLoc();
-+
-+ GfxFontLocType locType;
-+ GfxFontType fontType;
-+ Ref embFontID; // embedded stream obj ID
-+ // (if locType == gfxFontLocEmbedded)
-+ GString *path; // font file path
-+ // (if locType == gfxFontLocExternal)
-+ // PS font name
-+ // (if locType == gfxFontLocResident)
-+ int fontNum; // for TrueType collections
-+ // (if locType == gfxFontLocExternal)
-+ GString *encoding; // PS font encoding, only for 16-bit fonts
-+ // (if locType == gfxFontLocResident)
-+ int wMode; // writing mode, only for 16-bit fonts
-+ // (if locType == gfxFontLocResident)
-+ int substIdx; // substitute font index
-+ // (if locType == gfxFontLocExternal,
-+ // and a Base-14 substitution was made)
-+};
-+
-+//------------------------------------------------------------------------
- // GfxFont
- //------------------------------------------------------------------------
-
@@ -91,7 +127,8 @@
// Build a GfxFont object.
static GfxFont *makeFont(XRef *xref, char *tagA, Ref idA, Dict *fontDict);