[poppler] 3 commits - glib/poppler-page.cc poppler/CairoOutputDev.cc utils/.gitignore

[Adrian Johnson]

 glib/poppler-page.cc      |    2 +-
 poppler/CairoOutputDev.cc |    2 +-
 utils/.gitignore          |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fff439f25d9bbd199db5646deccd80733138898e
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Feb 19 15:45:31 2012 +1030

    update .gitignore

diff --git a/utils/.gitignore b/utils/.gitignore
index 71779f0..3be3139 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -12,3 +12,4 @@ pdftoppm
 pdftops
 pdftotext
 pdftocairo
+pdfdetach
commit 1cc3e152d6e879eb13fbdf2964ede3e01d13d097
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Feb 19 15:43:09 2012 +1030

    glib docs: fix typo

diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 60df8b5..64a65bd 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -987,7 +987,7 @@ image_draw_decide_cb (int image_id, void *data)
 /**
  * poppler_page_get_image:
  * @page: A #PopplerPage
- * @image_id: The image identificator
+ * @image_id: The image identifier
  *
  * Returns a cairo surface for the image of the @page
  *
commit 4f4db591276ec156c55b3a3c2020a1cf82f1519b
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Feb 19 15:37:04 2012 +1030

    cairo: fix pdftocairo crash when pdf document uses actualText

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index dab1e47..36d58c4 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -1306,7 +1306,7 @@ void CairoOutputDev::endTextObject(GfxState *state) {
 
 void CairoOutputDev::beginActualText(GfxState *state, GooString *text)
 {
-  if (text)
+  if (this->text)
     actualText->begin(state, text);
 }