Attachment 101254 Details for Bug 80154 – [PATCH v01 1/2] glib: Private function _poppler_link_mapping_new_from_form_field()

[patch] [PATCH v01 1/2] glib: Private function _poppler_link_mapping_new_from_form_field()

0001-glib-Private-function-_poppler_link_mapping_new_from.patch (text/plain), 3.30 KB, created by Alejandro Piñeiro (freenode IRC: apinheiro) on 2014-06-17 17:13:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Piñeiro (freenode IRC: apinheiro)

Created: 2014-06-17 17:13:19 UTC

Size: 3.30 KB

patch

obsolete

>From 306ba630e915334355dc06e88b482964f9a411f0 Mon Sep 17 00:00:00 2001
>From: Adrian Perez de Castro <aperez@igalia.com>
>Date: Thu, 26 Sep 2013 20:01:36 +0300
>Subject: [PATCH 1/2] glib: Private function
> _poppler_link_mapping_new_from_form_field()
>
>Move the code that creates a PopplerFormFieldMapping to its own function,
>and add it as private API. This will avoid duplication of the code when
>creation a PopplerFormFieldMapping from a PopplerStructureElement.
>---
> glib/poppler-page.cc   | 45 ++++++++++++++++++++++++++++++++-------------
> glib/poppler-private.h |  3 +++
> 2 files changed, 35 insertions(+), 13 deletions(-)
>
>diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
>index 167640d..9d33a54 100644
>--- a/glib/poppler-page.cc
>+++ b/glib/poppler-page.cc
>@@ -1275,6 +1275,34 @@ poppler_page_free_link_mapping (GList *list)
>   g_list_free (list);
> }
> 
>+
>+PopplerFormFieldMapping *
>+_poppler_form_field_mapping_new_from_form_field (PopplerFormField *form_field,
>+						 gint page_num)
>+{
>+  PopplerFormFieldMapping *mapping;
>+  Page *page;
>+
>+  g_assert (POPPLER_IS_FORM_FIELD (form_field));
>+  g_assert (page_num >= 0);
>+  g_assert (page_num < poppler_document_get_n_pages (form_field->document));
>+
>+  mapping = poppler_form_field_mapping_new ();
>+  mapping->field = form_field;
>+
>+  form_field->widget->getRect (&mapping->area.x1, &mapping->area.y1,
>+			       &mapping->area.x2, &mapping->area.y2);
>+
>+  page = form_field->document->doc->getPage (page_num + 1);
>+
>+  mapping->area.x1 -= page->getCropBox ()->x1;
>+  mapping->area.x2 -= page->getCropBox ()->x1;
>+  mapping->area.y1 -= page->getCropBox ()->y1;
>+  mapping->area.y2 -= page->getCropBox ()->y1;
>+
>+  return mapping;
>+}
>+
> /**
>  * poppler_page_get_form_field_mapping:
>  * @page: A #PopplerPage
>@@ -1301,21 +1329,12 @@ poppler_page_get_form_field_mapping (PopplerPage *page)
>   
>   for (i = 0; i < forms->getNumWidgets (); i++) {
>     PopplerFormFieldMapping *mapping;
>-    FormWidget *field;
>+    PopplerFormField *field = _poppler_form_field_new (page->document,
>+						       forms->getWidget (i));
> 
>-    mapping = poppler_form_field_mapping_new ();
>-    
>-    field = forms->getWidget (i);
>+    mapping = _poppler_form_field_mapping_new_from_form_field (field,
>+							       page->index);
> 
>-    mapping->field = _poppler_form_field_new (page->document, field);
>-    field->getRect (&(mapping->area.x1), &(mapping->area.y1),
>-		    &(mapping->area.x2), &(mapping->area.y2));
>-
>-    mapping->area.x1 -= page->page->getCropBox()->x1;
>-    mapping->area.x2 -= page->page->getCropBox()->x1;
>-    mapping->area.y1 -= page->page->getCropBox()->y1;
>-    mapping->area.y2 -= page->page->getCropBox()->y1;
>-    
>     map_list = g_list_prepend (map_list, mapping);
>   }
> 
>diff --git a/glib/poppler-private.h b/glib/poppler-private.h
>index 874cfdb..8e96bd4 100644
>--- a/glib/poppler-private.h
>+++ b/glib/poppler-private.h
>@@ -135,6 +135,9 @@ PopplerAnnot      *_poppler_annot_line_new (Annot *annot);
> PopplerAnnot      *_poppler_annot_circle_new (Annot *annot);
> PopplerAnnot      *_poppler_annot_square_new (Annot *annot);
> 
>+PopplerFormFieldMapping *_poppler_form_field_mapping_new_from_form_field (PopplerFormField *form_field,
>+									  gint page_num);
>+
> char *_poppler_goo_string_to_utf8(GooString *s);
> gboolean _poppler_convert_pdf_date_to_gtime (GooString *date,
> 					     time_t    *gdate);
>-- 
>1.9.3
>

Actions: View | Splinter Review

Attachments on bug 80154: 101254 | 101255

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.