summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2008-03-11 22:31:22 +0100
committerAlbert Astals Cid <aacid@kde.org>2008-03-11 22:31:22 +0100
commit43e5dd941d4bc35c4eebbad66c13235639e0c1a0 (patch)
treeab2391ecd9917b349e926c95f802f0d1582d6bb6
parentaab17684dc3f21ff2b1ee6eacdc0c565d368df78 (diff)
parent4fdd254370ea6055e95c8ebee51b69e06c501714 (diff)
Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-rw-r--r--glib/poppler-page.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 3f7479d3..0f39133b 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -1519,7 +1519,7 @@ poppler_page_get_annot_mapping (PopplerPage *page)
g_return_val_if_fail (POPPLER_IS_PAGE (page), NULL);
if (!page->annots)
- page->annots = page->page->getAnnots (document->doc->getCatalog ());
+ page->annots = page->page->getAnnots (page->document->doc->getCatalog ());
if (!page->annots)
return NULL;
@@ -1541,10 +1541,10 @@ poppler_page_get_annot_mapping (PopplerPage *page)
switch (annot->getType ())
{
case Annot::typeText:
- mapping->annot = poppler_annot_text_new (annot);
+ mapping->annot = _poppler_annot_text_new (annot);
break;
case Annot::typeFreeText:
- mapping->annot = poppler_annot_free_text_new (annot);
+ mapping->annot = _poppler_annot_free_text_new (annot);
break;
default:
mapping->annot = _poppler_annot_new (annot);