diff options
| author | jperkin <jperkin> | 2015-01-06 11:40:33 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-01-06 11:40:33 +0000 |
| commit | 2635b98b740895578f6955f01fc01f015ffa49fc (patch) | |
| tree | 6f18f1b32a9f1971da5352c06772cf84009f4c66 /print | |
| parent | 493058188296c98759750b843a67efe4dc90fd6b (diff) | |
| download | pkgsrc-2635b98b740895578f6955f01fc01f015ffa49fc.tar.gz | |
Avoid ambiguous overloaded function call.
Diffstat (limited to 'print')
| -rw-r--r-- | print/okular/distinfo | 3 | ||||
| -rw-r--r-- | print/okular/patches/patch-ui_pageview.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/print/okular/distinfo b/print/okular/distinfo index 279c8f5158a..0ce2dbdeae1 100644 --- a/print/okular/distinfo +++ b/print/okular/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2014/11/13 11:33:21 markd Exp $ +$NetBSD: distinfo,v 1.9 2015/01/06 11:40:33 jperkin Exp $ SHA1 (okular-4.14.3.tar.xz) = 54b931bdee75f6a247bc738177f29e96faeff110 RMD160 (okular-4.14.3.tar.xz) = 55b4b2324346c611e145c7dba018fb13e6e56307 Size (okular-4.14.3.tar.xz) = 1574360 bytes +SHA1 (patch-ui_pageview.cpp) = 15651ffbcd74727e64b34215fa507c8851462358 diff --git a/print/okular/patches/patch-ui_pageview.cpp b/print/okular/patches/patch-ui_pageview.cpp new file mode 100644 index 00000000000..a52a2380c1e --- /dev/null +++ b/print/okular/patches/patch-ui_pageview.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-ui_pageview.cpp,v 1.1 2015/01/06 11:40:33 jperkin Exp $ + +Avoid ambiguous overloaded function call. + +--- ui/pageview.cpp.orig 2014-11-06 22:38:13.000000000 +0000 ++++ ui/pageview.cpp +@@ -2351,7 +2351,7 @@ void PageView::mouseReleaseEvent( QMouse + double distance = 0.0; + rect = pageItem->page()->nearestObjectRect( Okular::ObjectRect::SourceRef, nX, nY, pageItem->uncroppedWidth(), pageItem->uncroppedHeight(), &distance ); + // distance is distanceSqr, adapt it to a normalized value +- distance = distance / (pow( pageItem->uncroppedWidth(), 2 ) + pow( pageItem->uncroppedHeight(), 2 )); ++ distance = distance / (pow( (float)pageItem->uncroppedWidth(), 2.0 ) + pow( (float)pageItem->uncroppedHeight(), 2.0 )); + if ( rect && ( distance > s_minDistance ) ) + rect = 0; + } |