diff options
| author | Albert Astals Cid <aacid@kde.org> | 2007-04-28 11:34:14 +0000 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2007-04-28 11:34:14 +0000 |
| commit | 218364bc4951682de8e63e1bd3f061636b08b615 (patch) | |
| tree | 974d26d4778ca54efc618c75ef0997ac91fefb6c | |
| parent | c1a40d3b4e9b27e34c94c9477a0313534563a394 (diff) | |
* glib/poppler-document.h:
* poppler/FontInfo.h:
* qt/poppler-qt.h:
* qt4/src/poppler-qt4.h: GfxFontType changed, adapt enums of the
frontends and helper classes. Forgot to do it before merging.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | glib/poppler-document.h | 6 | ||||
| -rw-r--r-- | poppler/FontInfo.h | 6 | ||||
| -rw-r--r-- | qt/poppler-qt.h | 6 | ||||
| -rw-r--r-- | qt4/src/poppler-qt4.h | 20 |
5 files changed, 35 insertions, 11 deletions
@@ -1,3 +1,11 @@ +2007-04-28 Albert Astals Cid <aacid@kde.org> + + * glib/poppler-document.h: + * poppler/FontInfo.h: + * qt/poppler-qt.h: + * qt4/src/poppler-qt4.h: GfxFontType changed, adapt enums of the + frontends and helper classes. + 2007-04-28 Pino Toscano <pino@kde.org> * qt4/src/poppler-annotation.h: diff --git a/glib/poppler-document.h b/glib/poppler-document.h index 64fd81e6..f600668a 100644 --- a/glib/poppler-document.h +++ b/glib/poppler-document.h @@ -57,11 +57,15 @@ typedef enum POPPLER_FONT_TYPE_UNKNOWN, POPPLER_FONT_TYPE_TYPE1, POPPLER_FONT_TYPE_TYPE1C, + POPPLER_FONT_TYPE_TYPE1COT, POPPLER_FONT_TYPE_TYPE3, POPPLER_FONT_TYPE_TRUETYPE, + POPPLER_FONT_TYPE_TRUETYPEOT, POPPLER_FONT_TYPE_CID_TYPE0, POPPLER_FONT_TYPE_CID_TYPE0C, - POPPLER_FONT_TYPE_CID_TYPE2 + POPPLER_FONT_TYPE_CID_TYPE0COT, + POPPLER_FONT_TYPE_CID_TYPE2, + POPPLER_FONT_TYPE_CID_TYPE2OT } PopplerFontType; typedef enum /*< flags >*/ diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h index e58237bb..81bf4b99 100644 --- a/poppler/FontInfo.h +++ b/poppler/FontInfo.h @@ -10,11 +10,15 @@ public: unknown, Type1, Type1C, + Type1COT, Type3, TrueType, + TrueTypeOT, CIDType0, CIDType0C, - CIDTrueType + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT }; // Constructor. diff --git a/qt/poppler-qt.h b/qt/poppler-qt.h index 815cba32..5c9ab244 100644 --- a/qt/poppler-qt.h +++ b/qt/poppler-qt.h @@ -72,11 +72,15 @@ public: unknown, Type1, Type1C, + Type1COT, Type3, TrueType, + TrueTypeOT, CIDType0, CIDType0C, - CIDTrueType + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT }; /** diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h index e1a4d972..9b6bb495 100644 --- a/qt4/src/poppler-qt4.h +++ b/qt4/src/poppler-qt4.h @@ -97,14 +97,18 @@ namespace Poppler { class FontInfo { public: enum Type { - unknown = 0, - Type1 = 1, - Type1C = 2, - Type3 = 3, - TrueType = 4, - CIDType0 = 5, - CIDType0C = 6, - CIDTrueType = 7 + unknown, + Type1, + Type1C, + Type1COT, + Type3, + TrueType, + TrueTypeOT, + CIDType0, + CIDType0C, + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT }; /** |