]> sigrok.org Git - pulseview.git/commitdiff
Corrected signed/unsigned inconsistencies in Ruler::paintEvent
authorJoel Holdsworth <redacted>
Sat, 13 Oct 2012 21:20:01 +0000 (22:20 +0100)
committerJoel Holdsworth <redacted>
Sat, 20 Oct 2012 17:29:25 +0000 (18:29 +0100)
pv/view/ruler.cpp

index a2e280b6f2291cd57ac11ce65403fb1dac9fd99b..f71240de1722c301d9b6ad0bb1960a8ff338e5ed 100644 (file)
@@ -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));