poppler/CairoFontEngine.cc | 7 +++---- poppler/CairoFontEngine.h | 3 +-- qt5/src/poppler-form.cc | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit 36d40492565faca3f0fc4fe7a77005b4fca45eec Author: Albert Astals Cid <[email protected]> Date: Fri Oct 5 00:17:01 2018 +0200 SignatureValidationInfoPrivate: Match declaration in poppler-form.h diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc index 9743149f..81bf509c 100644 --- a/qt5/src/poppler-form.cc +++ b/qt5/src/poppler-form.cc @@ -496,7 +496,8 @@ bool FormFieldChoice::canBeSpellChecked() const } -struct SignatureValidationInfoPrivate { +class SignatureValidationInfoPrivate { +public: SignatureValidationInfo::SignatureStatus signature_status; SignatureValidationInfo::CertificateStatus certificate_status; commit 530bf719646a1f909a70978e41b0487bd4198664 Author: Albert Astals Cid <[email protected]> Date: Fri Oct 5 00:13:55 2018 +0200 CairoType3Font: Remove unused member diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index 56ea9471..41064cac 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -767,11 +767,10 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc, } } - return new CairoType3Font(ref, doc, font_face, codeToGID, codeToGIDLen, printing, xref); + return new CairoType3Font(ref, font_face, codeToGID, codeToGIDLen, printing, xref); } CairoType3Font::CairoType3Font(Ref refA, - PDFDoc *docA, cairo_font_face_t *cairo_font_faceA, int *codeToGIDA, Guint codeToGIDLenA, @@ -780,8 +779,8 @@ CairoType3Font::CairoType3Font(Ref refA, codeToGIDA, codeToGIDLenA, gFalse, - printingA), - doc(docA) { } + printingA) +{ } CairoType3Font::~CairoType3Font() { } diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h index 60410099..9616f5c4 100644 --- a/poppler/CairoFontEngine.h +++ b/poppler/CairoFontEngine.h @@ -97,11 +97,10 @@ public: GBool matches(Ref &other, GBool printing) override; private: - CairoType3Font(Ref ref, PDFDoc *doc, + CairoType3Font(Ref ref, cairo_font_face_t *cairo_font_face, int *codeToGID, Guint codeToGIDLen, GBool printing, XRef *xref); - PDFDoc *doc; }; //------------------------------------------------------------------------ _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
