Attachment 70475 Details for Bug 54504 – check if words end with spaces

[patch] check if words end with spaces

glib-check-if-words-end-with-spaces.patch (text/plain), 3.39 KB, created by Jason Crain on 2012-11-23 12:19:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Crain

Created: 2012-11-23 12:19:25 UTC

Size: 3.39 KB

patch

obsolete

>From 41e86ed33114dc175d996329b586a965c12c0f7b Mon Sep 17 00:00:00 2001
>From: Jason Crain <jason@aquaticape.us>
>Date: Wed, 21 Nov 2012 14:15:59 -0600
>Subject: [PATCH] glib: check if words end with spaces
>
>poppler_page_get_text_layout and poppler_page_get_text_attributes
>assume that each word ends with a space or newline, causing them to
>become mismatched from the text.  This adds a check to
>TextWord::getSpaceAfter.
>---
> glib/poppler-page.cc |   48 ++++++++++++++++++++++++++----------------------
> 1 file changed, 26 insertions(+), 22 deletions(-)
>
>diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
>index b362a62..d3bdad3 100644
>--- a/glib/poppler-page.cc
>+++ b/glib/poppler-page.cc
>@@ -1980,7 +1980,8 @@ poppler_page_get_text_layout (PopplerPage       *page,
>   TextWordList *wordlist;
>   TextWord *word, *nextword;
>   PopplerRectangle *rect;
>-  int i, j, offset = 0;
>+  int i, j;
>+  guint offset = 0;
>   gdouble x1, y1, x2, y2;
>   gdouble x3, y3, x4, y4;
> 
>@@ -2001,8 +2002,11 @@ poppler_page_get_text_layout (PopplerPage       *page,
>   for (i = 0; i < wordlist->getLength (); i++)
>     {
>       word = wordlist->get (i);
>-      *n_rectangles += word->getLength () + 1;
>+      *n_rectangles += word->getLength ();
>+      if (!word->getNext () || word->getSpaceAfter ())
>+	(*n_rectangles)++;
>     }
>+  (*n_rectangles)--;
> 
>   *rectangles = g_new (PopplerRectangle, *n_rectangles);
> 
>@@ -2028,23 +2032,27 @@ poppler_page_get_text_layout (PopplerPage       *page,
>       nextword = word->getNext ();
>       if (nextword)
>         {
>-	  nextword->getBBox (&x3, &y3, &x4, &y4);
>-	  // space is from one word to other and with the same height as
>-	  // first word.
>-	  rect->x1 = x2;
>-	  rect->y1 = y1;
>-	  rect->x2 = x3;
>-	  rect->y2 = y2;
>-	}
>-      else
>+	  if (word->getSpaceAfter ())
>+	    {
>+	      nextword->getBBox (&x3, &y3, &x4, &y4);
>+	      // space is from one word to other and with the same height as
>+	      // first word.
>+	      rect->x1 = x2;
>+	      rect->y1 = y1;
>+	      rect->x2 = x3;
>+	      rect->y2 = y2;
>+	      offset++;
>+	    }
>+	  }
>+      else if (offset < *n_rectangles)
>         {
> 	  // end of line
> 	  rect->x1 = x2;
> 	  rect->y1 = y2;
> 	  rect->x2 = x2;
> 	  rect->y2 = y2;
>+	  offset++;
> 	}
>-      offset++;
>     }
> 
>   delete wordlist;
>@@ -2112,7 +2120,6 @@ poppler_page_get_text_attributes (PopplerPage *page)
>   TextPage *text;
>   TextWordList *wordlist;
>   PopplerTextAttributes *attrs = NULL;
>-  PopplerTextAttributes *previous = NULL;
>   gint i, offset = 0;
>   GList *attributes = NULL;
> 
>@@ -2137,23 +2144,20 @@ poppler_page_get_text_attributes (PopplerPage *page)
> 
>       for (word_i = 0; word_i < word->getLength (); word_i++)
> 	{
>-	  if (prev_word && word_text_attributes_equal (word, word_i, prev_word, prev_word_i)) {
>-	    attrs = previous;
>-	  } else {
>+	  if (!prev_word || !word_text_attributes_equal (word, word_i, prev_word, prev_word_i)) {
> 	    attrs = poppler_text_attributes_new_from_word (word, word_i);
> 	    attrs->start_index = offset;
>-	    if (previous)
>-	      previous->end_index--;
>-	    previous = attrs;
> 	    attributes = g_list_prepend (attributes, attrs);
> 	  }
>-	  offset++;
> 	  attrs->end_index = offset;
>+	  offset++;
> 	  prev_word = word;
> 	  prev_word_i = word_i;
> 	}
>-      offset++;
>-      attrs->end_index = offset;
>+      if (!word->getNext () || word->getSpaceAfter ()) {
>+	attrs->end_index = offset;
>+	offset++;
>+      }
>     }
>   if (attrs)
>     attrs->end_index--;
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 54504: 66623 | 70475

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.