poppler/Gfx.cc | 3 +++ poppler/TextOutputDev.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 35015ed11090d67cab69443e607d4d80ca03c619 Author: Nils Höglund <[email protected]> Date: Thu Feb 18 23:14:51 2010 +0000 Match the number of calls to beginMarkedContent and endMarkedContent diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc index bc194af..9000237 100644 --- a/poppler/Gfx.cc +++ b/poppler/Gfx.cc @@ -31,6 +31,7 @@ // Copyright (C) 2009, 2010 Thomas Freitag <[email protected]> // Copyright (C) 2009 William Bader <[email protected]> // Copyright (C) 2009, 2010 David Benjamin <[email protected]> +// Copyright (C) 2010 Nils Höglund <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -4562,6 +4563,8 @@ void Gfx::opBeginMarkedContent(Object args[], int numArgs) { if(numArgs == 2 && args[1].isDict ()) { out->beginMarkedContent(args[0].getName(),args[1].getDict()); + } else if(numArgs == 1) { + out->beginMarkedContent(args[0].getName(),NULL); } } commit ee265760e6ecec93fe26fb8e02848872555daefd Author: Albert Astals Cid <[email protected]> Date: Thu Feb 18 23:13:48 2010 +0000 make sure properties exists before using it diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc index 442ace2..3b16622 100644 --- a/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc @@ -17,7 +17,7 @@ // Copyright (C) 2006 Jeff Muizelaar <[email protected]> // Copyright (C) 2007, 2008 Adrian Johnson <[email protected]> // Copyright (C) 2008 Koji Otani <[email protected]> -// Copyright (C) 2008 Albert Astals Cid <[email protected]> +// Copyright (C) 2008, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Pino Toscano <[email protected]> // Copyright (C) 2008 Hib Eris <[email protected]> // Copyright (C) 2009 Ross Moore <[email protected]> @@ -4548,7 +4548,7 @@ void ActualText::beginMC(Dict *properties) { } Object obj; - if (properties->lookup("ActualText", &obj)) { + if (properties && properties->lookup("ActualText", &obj)) { if (obj.isString()) { actualText = obj.getString(); actualTextBMCLevel = 1;
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
