[poppler] Branch 'poppler-0.22' - poppler/Link.cc

[Albert Astals Cid]

 poppler/Link.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3206950658521009b52f638cc5e712e0cef42706
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 18 21:06:09 2013 +0100

    Spec says Zoom -> 0 means no zoom change

diff --git a/poppler/Link.cc b/poppler/Link.cc
index b5b2bd3..20184d1 100644
--- a/poppler/Link.cc
+++ b/poppler/Link.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
 // Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
-// Copyright (C) 2008-2010, 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008-2010, 2012, 2013 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
 // Copyright (C) 2012 Tobias Koening <tobias.koenig at kdab.com>
@@ -220,8 +220,8 @@ LinkDest::LinkDest(Array *a) {
       if (obj2.isNull()) {
 	changeZoom = gFalse;
       } else if (obj2.isNum()) {
-	changeZoom = gTrue;
 	zoom = obj2.getNum();
+	changeZoom = (zoom == 0) ? gFalse : gTrue;
       } else {
 	error(errSyntaxWarning, -1, "Bad annotation destination position");
 	goto err1;