Tue Jan 6 11:40:33 2015 UTC ()
Avoid ambiguous overloaded function call.
(jperkin)
diff -r1.8 -r1.9 pkgsrc/print/okular/distinfo
diff -r0 -r1.1 pkgsrc/print/okular/patches/patch-ui_pageview.cpp
--- pkgsrc/print/okular/distinfo 2014/11/13 11:33:21 1.8
+++ pkgsrc/print/okular/distinfo 2015/01/06 11:40:33 1.9
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.8 2014/11/13 11:33:21 markd Exp $ | | 1 | $NetBSD: distinfo,v 1.9 2015/01/06 11:40:33 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (okular-4.14.3.tar.xz) = 54b931bdee75f6a247bc738177f29e96faeff110 | | 3 | SHA1 (okular-4.14.3.tar.xz) = 54b931bdee75f6a247bc738177f29e96faeff110 |
| 4 | RMD160 (okular-4.14.3.tar.xz) = 55b4b2324346c611e145c7dba018fb13e6e56307 | | 4 | RMD160 (okular-4.14.3.tar.xz) = 55b4b2324346c611e145c7dba018fb13e6e56307 |
| 5 | Size (okular-4.14.3.tar.xz) = 1574360 bytes | | 5 | Size (okular-4.14.3.tar.xz) = 1574360 bytes |
| | | 6 | SHA1 (patch-ui_pageview.cpp) = 15651ffbcd74727e64b34215fa507c8851462358 |
$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;
}