diff options
-rw-r--r-- | glib/poppler-action.cc | 2 | ||||
-rw-r--r-- | glib/poppler-page.cc | 14 | ||||
-rw-r--r-- | qt5/src/poppler-document.cc | 2 | ||||
-rw-r--r-- | qt5/src/poppler-optcontent.cc | 4 | ||||
-rw-r--r-- | qt5/src/poppler-outline.cc | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/glib/poppler-action.cc b/glib/poppler-action.cc index d5c8dd8e..0d7a559b 100644 --- a/glib/poppler-action.cc +++ b/glib/poppler-action.cc @@ -580,7 +580,7 @@ build_ocg_state (PopplerDocument *document, PopplerAction *action, const LinkOCGState *ocg_state) { - const auto *st_list = ocg_state->getStateList(); + const std::vector<LinkOCGState::StateList*> *st_list = ocg_state->getStateList(); bool preserve_rb = ocg_state->getPreserveRB(); GList *layer_state = nullptr; diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc index 6bc19f58..dc82afc4 100644 --- a/glib/poppler-page.cc +++ b/glib/poppler-page.cc @@ -656,7 +656,7 @@ poppler_page_get_selection_region (PopplerPage *page, } text = poppler_page_get_text_page (page); - auto list = text->getSelectionRegion(&poppler_selection, + std::vector<PDFRectangle*>* list = text->getSelectionRegion(&poppler_selection, selection_style, scale); for (std::size_t i = 0; i < list->size(); i++) { @@ -744,7 +744,7 @@ poppler_page_get_selected_region (PopplerPage *page, } text = poppler_page_get_text_page (page); - auto list = text->getSelectionRegion(&poppler_selection, + std::vector<PDFRectangle*>* list = text->getSelectionRegion(&poppler_selection, selection_style, 1.0); region = cairo_region_create (); @@ -2179,14 +2179,14 @@ poppler_page_get_text_layout_for_area (PopplerPage *page, selection.y2 = area->y2; text = poppler_page_get_text_page (page); - auto word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines); + std::vector<TextWordSelection*>** word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines); if (!word_list) return FALSE; n_rects += n_lines - 1; for (i = 0; i < n_lines; i++) { - auto *line_words = word_list[i]; + std::vector<TextWordSelection*> *line_words = word_list[i]; n_rects += line_words->size() - 1; for (std::size_t j = 0; j < line_words->size(); j++) { @@ -2200,7 +2200,7 @@ poppler_page_get_text_layout_for_area (PopplerPage *page, for (i = 0; i < n_lines; i++) { - auto *line_words = word_list[i]; + std::vector<TextWordSelection*> *line_words = word_list[i]; for (std::size_t j = 0; j < line_words->size(); j++) { TextWordSelection *word_sel = (*line_words)[j]; @@ -2363,13 +2363,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page, selection.y2 = area->y2; text = poppler_page_get_text_page (page); - auto word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines); + std::vector<TextWordSelection*>** word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines); if (!word_list) return nullptr; for (i = 0; i < n_lines; i++) { - auto *line_words = word_list[i]; + std::vector<TextWordSelection*> *line_words = word_list[i]; for (std::size_t j = 0; j < line_words->size(); j++) { TextWordSelection *word_sel = (*line_words)[j]; diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index 0b70a97c..6298e7f1 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -606,7 +606,7 @@ namespace Poppler { QVector<OutlineItem> result; if (::Outline *outline = m_doc->doc->getOutline()) { - if (const auto *items = outline->getItems()) { + if (const std::vector<::OutlineItem*> *items = outline->getItems()) { for (void *item : *items) { result.push_back(OutlineItem{new OutlineItemData{static_cast<::OutlineItem *>(item), m_doc}}); } diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc index d010d0c1..e3422b7c 100644 --- a/qt5/src/poppler-optcontent.cc +++ b/qt5/src/poppler-optcontent.cc @@ -398,11 +398,11 @@ namespace Poppler QSet<OptContentItem *> changedItems; - const auto *statesList = popplerLinkOCGState->getStateList(); + const std::vector<::LinkOCGState::StateList*> *statesList = popplerLinkOCGState->getStateList(); for (std::size_t i = 0; i < statesList->size(); ++i) { ::LinkOCGState::StateList *stateList = (*statesList)[i]; - auto *refsList = stateList->list; + std::vector<Ref*> *refsList = stateList->list; for (std::size_t j = 0; j < refsList->size(); ++j) { Ref *ref = (*refsList)[j]; OptContentItem *item = d->itemFromRef(QString::number(ref->num)); diff --git a/qt5/src/poppler-outline.cc b/qt5/src/poppler-outline.cc index 3963694d..6816348b 100644 --- a/qt5/src/poppler-outline.cc +++ b/qt5/src/poppler-outline.cc @@ -165,7 +165,7 @@ QVector<OutlineItem> OutlineItem::children() const if (::OutlineItem *data = m_data->data) { data->open(); - if (const auto *kids = data->getKids()) { + if (const std::vector<::OutlineItem*> *kids = data->getKids()) { for (void *kid : *kids) { result.push_back(OutlineItem{new OutlineItemData{static_cast<::OutlineItem *>(kid), m_data->documentData}}); } |