projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a2305b
)
Fix polymorphic function lookup problem
author
Marcus Comstedt
<marcus@mc.pp.se>
Sun, 6 Apr 2014 15:04:42 +0000
(17:04 +0200)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sun, 4 May 2014 18:09:10 +0000
(20:09 +0200)
Instead of taking min() of a qreal and a double, use two doubles.
(The result is assigned to a double anyway.)
Fixes build problem on Android
pv/view/decodetrace.cpp
patch
|
blob
|
history
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index c3bc1dff0a4981170e86b748fe8f45c1a7206b33..618de9a338fe88c566f3e2904a56ae483755d9b6 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-373,7
+373,7
@@
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
{
const QString text = a.annotations().empty() ?
QString() : a.annotations().back();
- const double w = min(p.boundingRect(QRectF(), 0, text).width(),
+ const double w = min(
(double)
p.boundingRect(QRectF(), 0, text).width(),
0.0) + h;
const QRectF rect(x - w / 2, y - h / 2, w, h);