[poppler] 2 commits - poppler/CairoOutputDev.cc poppler/Gfx.cc

[GitLab Mirror]

 poppler/CairoOutputDev.cc |    2 +-
 poppler/Gfx.cc            |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0a22389b3ce94cdd20917fe18ad7e3343f04e105
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed May 13 23:12:43 2020 +0200

    Update (C)

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 231b9ab2..83f1c78d 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -31,7 +31,7 @@
 // Copyright (C) 2015 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018, 2020 Adam Reichold <adam.reichold at t-online.de>
-// Copyright (C) 2019 Marek Kasik <mkasik at redhat.com>
+// Copyright (C) 2019, 2020 Marek Kasik <mkasik at redhat.com>
 // Copyright (C) 2020 Michal <sudolskym at gmail.com>
 // Copyright (C) 2020 Oliver Sander <oliver.sander at tu-dresden.de>
 //
commit 7e87f574746f3095468bc3d86fa6690e108c4eab
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue May 12 23:04:06 2020 +0200

    Don't do float division by 0, it's undefined

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index c248c576..498a8c9c 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -2061,11 +2061,11 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
 
   // construct a (device space) -> (pattern space) transform matrix
   det = m1[0] * m1[3] - m1[1] * m1[2];
-  det = 1 / det;
-  if (!std::isfinite(det)) {
+  if (unlikely(!std::isnormal(det))) {
     error(errSyntaxError, getPos(), "Singular matrix in tiling pattern fill");
     return;
   }
+  det = 1 / det;
   imb[0] = m1[3] * det;
   imb[1] = -m1[1] * det;
   imb[2] = -m1[2] * det;