head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.12 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.6 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.4 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.2 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.4.0.2 pkgsrc-2008Q2-base:1.4; locks; strict; comment @# @; 1.6 date 2008.08.06.18.44.25; author drochner; state dead; branches; next 1.5; 1.5 date 2008.07.15.10.34.21; author drochner; state Exp; branches; next 1.4; 1.4 date 2008.06.05.21.03.38; author drochner; state dead; branches; next 1.3; 1.3 date 2008.05.15.09.15.41; author drochner; state Exp; branches; next 1.2; 1.2 date 2008.04.29.19.23.34; author drochner; state dead; branches; next 1.1; 1.1 date 2008.04.15.19.57.00; author drochner; state Exp; branches; next ; desc @@ 1.6 log @update to 0.8.5 changes: -fix some crashes and memory leaks -pdftohtml improvements @ text @$NetBSD: patch-ah,v 1.5 2008/07/15 10:34:21 drochner Exp $ --- poppler/Page.cc.orig 2008-07-02 15:45:43.000000000 +0200 +++ poppler/Page.cc @@@@ -466,7 +466,7 @@@@ GBool Page::loadThumb(unsigned char **da /* Get stream dict */ thumb.fetch(xref, &fetched_thumb); - if (fetched_thumb.isNull()) { + if (!fetched_thumb.isStream()) { fetched_thumb.free(); return gFalse; } @ 1.5 log @update to 0.8.4 changes: -bugfixes -build fix for qt4 (which doesn't work) The security fix for CVE-2008-2950 is not yet integrated upstream. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @update to 0.8.3 changes: -fix crashes on certain input -Fix leaks -Do not limit CharCodeToUnicodeString to 8 characters -Support for surrogates outside the BMP plane pkgsrc note: the crashes had been fixed by patches in pkgsrc before @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2008/05/15 09:15:41 drochner Exp $ d3 10 a12 9 --- poppler/Annot.cc.orig 2008-03-26 20:38:52.000000000 +0100 +++ poppler/Annot.cc @@@@ -1735,7 +1735,7 @@@@ void AnnotWidget::initialize(XRef *xrefA // Only text or choice fields needs to have appearance regenerated // see section 8.6.2 "Variable Text" of PDFReference regen = gFalse; - if (widget->getType () == formText || widget->getType () == formChoice) { + if (widget != NULL && (widget->getType () == formText || widget->getType () == formChoice)) { regen = form->getNeedAppearances (); a13 10 @@@@ -2577,7 +2577,7 @@@@ void AnnotWidget::generateFieldAppearanc int dashLength, ff, quadding, comb, nOptions, topIdx, i, j; GBool modified; - if (!widget->getField () || !widget->getField ()->getObj ()->isDict ()) + if (widget == NULL || !widget->getField () || !widget->getField ()->getObj ()->isDict ()) return; field = widget->getField ()->getObj ()->getDict (); @ 1.3 log @pulla patch from upstream CVS which appearently fixes a problem reported by Steven M. Bellovin on pkgsrc-users, bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 0.8.1 Some fixes which we had patched in pkgsrc are included now. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2008/04/15 19:57:00 drochner Exp $ d3 10 a12 15 --- poppler/CairoFontEngine.cc.orig 2008-01-29 23:03:38.000000000 +0100 +++ poppler/CairoFontEngine.cc @@@@ -31,11 +31,10 @@@@ static void fileWrite(void *stream, char // CairoFont //------------------------------------------------------------------------ -static void cairo_font_face_destroy (void *data) +static void _ft_done_face (void *data) { - CairoFont *font = (CairoFont *) data; - - delete font; + FT_Face face = (FT_Face) data; + FT_Done_Face (face); } d14 3 a16 25 CairoFont *CairoFont::create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs) { @@@@ -224,16 +223,16 @@@@ CairoFont *CairoFont::create(GfxFont *gf cairo_font_face = cairo_ft_font_face_create_for_ft_face (face, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP); - if (cairo_font_face == NULL) { - error(-1, "could not create cairo font\n"); + if (cairo_font_face_status (cairo_font_face)) { + error(-1, "could not create cairo font: %s\n", cairo_status_to_string (cairo_font_face_status (cairo_font_face))); goto err2; /* this doesn't do anything, but it looks like we're * handling the error */ } { CairoFont *ret = new CairoFont(ref, cairo_font_face, face, codeToGID, codeToGIDLen, substitute); - cairo_font_face_set_user_data (cairo_font_face, + cairo_font_face_set_user_data (cairo_font_face, &cairo_font_face_key, - ret, - cairo_font_face_destroy); + face, + _ft_done_face); return ret; } @@@@ -249,7 +248,7 @@@@ CairoFont::CairoFont(Ref ref, cairo_font codeToGIDLen(codeToGIDLen), substitute(substitute) { } d18 3 a20 5 CairoFont::~CairoFont() { - FT_Done_Face (face); + cairo_font_face_destroy (cairo_font_face); gfree(codeToGID); } d22 1 @ 1.1 log @update to 0.8.0 changes: * Fix caching of members in the glib frontend causing issues with rendering * Change glib public api to have a correct naming * Some better error handling on corner cases * Check the document stream is seekable when opening it * Build fixes with autotools and with cmake * Fix infinite recursion on some malformed documents when consulting the fonts * Fix possible crash when asking for Movie contents @ text @d1 1 a1 1 $NetBSD$ @