[poppler] Branch 'poppler-0.20' - 3 commits - NEWS poppler/TextOutputDev.cc

[Albert Astals Cid]

 NEWS                     |    4 ++--
 poppler/TextOutputDev.cc |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3ce4d213480471dfd8e307c24c99bf3c6308cd6f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Sep 11 19:24:58 2012 +0200

    Do not use isnan as it is C99

diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 0795bb3..a9c9d70 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -20,7 +20,7 @@
 // Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
 // Copyright (C) 2007, 2008 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2008 Koji Otani <sho at bbr.jp>
-// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2010-2012 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2008 Pino Toscano <pino at kde.org>
 // Copyright (C) 2008, 2010 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2009 Ross Moore <ross at maths.mq.edu.au>
@@ -2301,8 +2301,8 @@ void TextPage::addChar(GfxState *state, double x, double y,
   if (x1 + w1 < 0 || x1 > pageWidth ||
       y1 + h1 < 0 || y1 > pageHeight ||
       w1 > pageWidth || h1 > pageHeight ||
-      isnan(x1) || isnan(y1) ||
-      isnan(w1) || isnan(h1)) {
+      x1 != x1 || y1 != y1 || // IEEE way of checking for isnan
+      w1 != w1 || h1 != h1) {
     charPos += nBytes;
     return;
   }
commit 4d7a64a23fd4b4b5ee0d47ead8677f374aaaf6c9
Author: Jason Crain <jason at aquaticape.us>
Date:   Tue Sep 11 19:24:11 2012 +0200

    Check for NaN in TextPage::addChar

diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index e8d993b..0795bb3 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -29,6 +29,7 @@
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 // Copyright (C) 2011 Sam Liao <phyomh at gmail.com>
 // Copyright (C) 2012 Horst Prote <prote at fmi.uni-stuttgart.de>
+// Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -2299,7 +2300,9 @@ void TextPage::addChar(GfxState *state, double x, double y,
   state->transform(x, y, &x1, &y1);
   if (x1 + w1 < 0 || x1 > pageWidth ||
       y1 + h1 < 0 || y1 > pageHeight ||
-      w1 > pageWidth || h1 > pageHeight) {
+      w1 > pageWidth || h1 > pageHeight ||
+      isnan(x1) || isnan(y1) ||
+      isnan(w1) || isnan(h1)) {
     charPos += nBytes;
     return;
   }
commit 5f338ea7d01cabc0f8c50690d0bc262d85baa0ed
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Sep 10 19:47:20 2012 +0200

    Fix typo

diff --git a/NEWS b/NEWS
index f73dac0..2e874b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Release 0.20.4
         core:
-         * Improvements regarding embeddef file handling. (KDE Bug #306008)
+         * Improvements regarding embedded file handling. (KDE Bug #306008)
          * Fix opening some broken files (Bug #14303)
          * Fix memory leaks
          * Fix crashes in various broken files
@@ -9,7 +9,7 @@ Release 0.20.4
          * Remove execution permissions from a header file
 
         qt4:
-         * Improvements regarding embeddef file handling. (KDE Bug #306008)
+         * Improvements regarding embedded file handling. (KDE Bug #306008)
 
 Release 0.20.3
         core: