[poppler] 2 commits - poppler/Annot.cc

[Albert Astals Cid]

 poppler/Annot.cc |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 15d40392a29dded8a29c2dc9d7c15b402515e033
Merge: be5d9af 39882df
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Feb 28 19:46:59 2013 +0100

    Merge remote-tracking branch 'origin/poppler-0.22'

diff --cc poppler/Annot.cc
index 48af4eb,064b550..1260677
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@@ -23,9 -23,9 +23,9 @@@
  // Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
  // Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
  // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
- // Copyright (C) 2011 José Aliste <jaliste at src.gnome.org>
+ // Copyright (C) 2011, 2013 José Aliste <jaliste at src.gnome.org>
  // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 -// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 +// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
  // Copyright (C) 2012 Tobias Koenig <tokoe at kdab.com>
  //
  // To see a description of the changes please see the Changelog file that
commit 39882dfecdccc00db353946a31d395582ee37022
Author: José Aliste <jaliste at src.gnome.org>
Date:   Wed Feb 27 01:33:38 2013 +0100

    Correct rendering of underline and strike out annotations
    
    Current code assumes that the text to underline or strike out is horizontal.
    Fixes bug #61518

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index dae0f62..064b550 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -23,7 +23,7 @@
 // Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
-// Copyright (C) 2011 José Aliste <jaliste at src.gnome.org>
+// Copyright (C) 2011, 2013 José Aliste <jaliste at src.gnome.org>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2012 Tobias Koenig <tokoe at kdab.com>
@@ -3601,14 +3601,15 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
       appearBuf->append ("[] 0 d 1 w\n");
 
       for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
-        double x1, x2, y3;
+	double x3, y3, x4, y4;
 
-	x1 = quadrilaterals->getX1(i);
-	x2 = quadrilaterals->getX2(i);
+	x3 = quadrilaterals->getX3(i);
 	y3 = quadrilaterals->getY3(i);
+	x4 = quadrilaterals->getX4(i);
+	y4 = quadrilaterals->getY4(i);
 
-	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3);
-	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3);
+	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x4, y4);
 	appearBuf->append ("S\n");
       }
       break;
@@ -3620,17 +3621,21 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
       appearBuf->append ("[] 0 d 1 w\n");
 
       for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
-        double x1, y1, x2, y3;
-	double h2;
+	double x1, y1, x2, y2;
+	double x3, y3, x4, y4;
 
 	x1 = quadrilaterals->getX1(i);
 	y1 = quadrilaterals->getY1(i);
 	x2 = quadrilaterals->getX2(i);
+	y2 = quadrilaterals->getY2(i);
+
+	x3 = quadrilaterals->getX3(i);
 	y3 = quadrilaterals->getY3(i);
-	h2 = (y1 - y3) / 2.0;
+	x4 = quadrilaterals->getX4(i);
+	y4 = quadrilaterals->getY4(i);
 
-	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h2);
-	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3+h2);
+	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.);
+	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.);
 	appearBuf->append ("S\n");
       }
       break;