[dvi] Let kpathsea use ANSI C str(r)chr() instead of (r)index()

[evince.git] / backend / pdf / ev-poppler.cc

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 506e9349b0ce23b7052eaa286a56024e84c0dcb2..6d1c937a9401d231b6e1cec1d9d73831c7657f41 100644 (file)
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -1260,7 +1260,7 @@ pdf_document_links_get_links_model (EvDocumentLinks *document_links)
 
 static GList *
 pdf_document_links_get_links (EvDocumentLinks *document_links,
 
 static GList *
 pdf_document_links_get_links (EvDocumentLinks *document_links,

-                             gint             page)
+                             EvPage          *page)

 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;


@@ -1270,8 +1270,7 @@ pdf_document_links_get_links (EvDocumentLinks *document_links,
        double height;
 
        pdf_document = PDF_DOCUMENT (document_links);
        double height;
 
        pdf_document = PDF_DOCUMENT (document_links);

-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 page);
+       poppler_page = POPPLER_PAGE (page->backend_page);

        mapping_list = poppler_page_get_link_mapping (poppler_page);
        poppler_page_get_size (poppler_page, NULL, &height);
 
        mapping_list = poppler_page_get_link_mapping (poppler_page);
        poppler_page_get_size (poppler_page, NULL, &height);
 


@@ -1293,7 +1292,6 @@ pdf_document_links_get_links (EvDocumentLinks *document_links,
        }
 
        poppler_page_free_link_mapping (mapping_list);
        }
 
        poppler_page_free_link_mapping (mapping_list);

-       g_object_unref (poppler_page);

 
        return g_list_reverse (retval);
 }
 
        return g_list_reverse (retval);
 }


@@ -1328,7 +1326,7 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 
 static GList *
 pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
 
 static GList *
 pdf_document_images_get_image_mapping (EvDocumentImages *document_images,

-                                      gint              page)
+                                      EvPage           *page)

 {
        GList *retval = NULL;
        PdfDocument *pdf_document;
 {
        GList *retval = NULL;
        PdfDocument *pdf_document;


@@ -1337,7 +1335,7 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
        GList *list;
 
        pdf_document = PDF_DOCUMENT (document_images);
        GList *list;
 
        pdf_document = PDF_DOCUMENT (document_images);

-       poppler_page = poppler_document_get_page (pdf_document->document, page);
+       poppler_page = POPPLER_PAGE (page->backend_page);

        mapping_list = poppler_page_get_image_mapping (poppler_page);
 
        for (list = mapping_list; list; list = list->next) {
        mapping_list = poppler_page_get_image_mapping (poppler_page);
 
        for (list = mapping_list; list; list = list->next) {


@@ -1348,7 +1346,7 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
 
                ev_image_mapping = g_new (EvMapping, 1);
                
 
                ev_image_mapping = g_new (EvMapping, 1);
                

-               ev_image_mapping->data = ev_image_new (page, image_mapping->image_id);
+               ev_image_mapping->data = ev_image_new (page->index, image_mapping->image_id);

                ev_image_mapping->area.x1 = image_mapping->area.x1;
                ev_image_mapping->area.y1 = image_mapping->area.y1;
                ev_image_mapping->area.x2 = image_mapping->area.x2;
                ev_image_mapping->area.x1 = image_mapping->area.x1;
                ev_image_mapping->area.y1 = image_mapping->area.y1;
                ev_image_mapping->area.x2 = image_mapping->area.x2;


@@ -1358,7 +1356,6 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
        }
 
        poppler_page_free_image_mapping (mapping_list);
        }
 
        poppler_page_free_image_mapping (mapping_list);

-       g_object_unref (poppler_page);

 
        return g_list_reverse (retval);
 }
 
        return g_list_reverse (retval);
 }