[poppler] 3 commits - autogen.sh poppler/GfxFont.cc utils/HtmlOutputDev.cc

[Albert Astals Cid]

 autogen.sh             |    9 ++++++++-
 poppler/GfxFont.cc     |    3 ++-
 utils/HtmlOutputDev.cc |    3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 8a9e561bfe64f71e9f38c43e5c6be7e5069b2349
Author: Hib Eris <hib at hiberis.nl>
Date:   Fri Jul 2 21:07:53 2010 +0200

    Nicer autogen.sh output

diff --git a/autogen.sh b/autogen.sh
index 953c14f..b2de90c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -115,6 +115,7 @@ fi
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
 
+printbold "Running autoreconf -v -i ..."
 (cd $srcdir && autoreconf -v -i )
 
 if $want_gtk_doc; then
commit ce4d328294cea73f4b7368691dc1fed6bd45d569
Author: Hib Eris <hib at hiberis.nl>
Date:   Fri Jul 2 20:51:47 2010 +0200

    Add option for autogen.sh to skip configure
    
    If you do not want to automatically run configure when calling
    autogen.sh, run it with:
    
    $ NOCONFIGURE=1 ./autogen.sh
    
    This feature is modeled after gnome-autogen.sh behaviour.

diff --git a/autogen.sh b/autogen.sh
index 6a4d508..953c14f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -122,4 +122,10 @@ if $want_gtk_doc; then
     (cd $srcdir && $GTKDOCIZE --copy) || exit 1
 fi
 
-$srcdir/configure $@
+if test x$NOCONFIGURE = x; then
+    printbold "Running $srcdir/configure $@ ..."
+    $srcdir/configure $@
+else
+    printbold "Skipping configure process."
+fi
+
commit d7ee87c5d0a35c8d4fcc88bde4b8496c49f397c6
Author: Hib Eris <hib at hiberis.nl>
Date:   Tue Jul 6 15:16:08 2010 +0100

    warnings-=2

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index aeab6f3..9b72d34 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -19,7 +19,7 @@
 // Copyright (C) 2007 Ed Catmur <ed at catmur.co.uk>
 // Copyright (C) 2008 Jonathan Kew <jonathan_kew at sil.org>
 // Copyright (C) 2008 Ed Avis <eda at waniasset.com>
-// Copyright (C) 2008 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2008, 2010 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2009 Peter Kerzum <kerzum at yandex-team.ru>
 // Copyright (C) 2009, 2010 David Benjamin <davidben at mit.edu>
 //
@@ -1328,6 +1328,7 @@ GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
   descent = -0.35;
   fontBBox[0] = fontBBox[1] = fontBBox[2] = fontBBox[3] = 0;
   cMap = NULL;
+  cMapName = NULL;
   ctu = NULL;
   widths.defWidth = 1.0;
   widths.defHeight = -1.0;
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index 81f8b88..dbf677f 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -26,6 +26,7 @@
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2009 Reece Dunn <msclrhd at gmail.com>
 // Copyright (C) 2010 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
 //
 // 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
@@ -1529,7 +1530,7 @@ void HtmlOutputDev::dumpMetaVars(FILE *file)
 
 GBool HtmlOutputDev::dumpDocOutline(Catalog* catalog)
 { 
-	FILE * output;
+	FILE * output = NULL;
 	GBool bClose = gFalse;
 
 	if (!ok || xml)