From: Joel Holdsworth <redacted>
Date: Sat, 13 Oct 2012 21:20:01 +0000 (+0100)
Subject: Corrected signed/unsigned inconsistencies in Ruler::paintEvent
X-Git-Tag: pulseview-0.1.0~249
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=cfa7293b40f15b4713cdc6ee7260ab15fce4b719;p=pulseview.git

Corrected signed/unsigned inconsistencies in Ruler::paintEvent
---

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a2e280b6..f71240de 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -56,7 +56,7 @@ void Ruler::paintEvent(QPaintEvent *event)
 	const int order = (int)floorf(log10f(min_period));
 	const double order_decimal = pow(10, order);
 
-	int unit = 0;
+	unsigned int unit = 0;
 	double tick_period = 0.0f;
 
 	do
@@ -64,7 +64,7 @@ void Ruler::paintEvent(QPaintEvent *event)
 		tick_period = order_decimal * ScaleUnits[unit++];
 	} while(tick_period < min_period && unit < countof(ScaleUnits));
 
-	const int prefix = (order - FirstSIPrefixPower) / 3;
+	const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
 	assert(prefix >= 0);
 	assert(prefix < countof(SIPrefixes));