Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-31 22:23:54 +01:00
Code Issues Releases Wiki Activity

narrow scopes of loop indices

Browse Source
This commit is contained in:
Paul Licameli
2020-01-20 13:21:38 -05:00
parent 605a4056c9
commit 05c80cfb4f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/Ruler.cpp
View File

@@ -932,8 +932,6 @@ void Ruler::Update(
// (i.e. we've been invalidated). Recompute all // (i.e. we've been invalidated). Recompute all
// tick positions and font size. // tick positions and font size.
int j;
if (!mUserFonts) { if (!mUserFonts) {
int fontSize = 4; int fontSize = 4;
wxCoord strW, strH, strD, strL; wxCoord strW, strH, strD, strL;
@@ -1082,7 +1080,7 @@ void Ruler::Update(
// Major and minor ticks // Major and minor ticks
for (int jj = 0; jj < 2; ++jj) { for (int jj = 0; jj < 2; ++jj) {
const double denom = jj == 0 ? tickSizes.mMajor : tickSizes.mMinor; const double denom = jj == 0 ? tickSizes.mMajor : tickSizes.mMinor;
int i = -1; j = 0; int ii = -1, j = 0;
double d, warpedD, nextD; double d, warpedD, nextD;
double prevTime = 0.0, time = 0.0; double prevTime = 0.0, time = 0.0;
@@ -1101,8 +1099,8 @@ void Ruler::Update(
// using ints doesn't work, as // using ints doesn't work, as
// this will overflow and be negative at high zoom. // this will overflow and be negative at high zoom.
double step = floor(sg * warpedD / denom); double step = floor(sg * warpedD / denom);
while (i <= mLength) { while (ii <= mLength) {
i++; ii++;
if (zoomInfo) if (zoomInfo)
{ {
prevTime = time; prevTime = time;
@@ -1121,7 +1119,7 @@ void Ruler::Update(
if (floor(sg * warpedD / denom) > step) { if (floor(sg * warpedD / denom) > step) {
step = floor(sg * warpedD / denom); step = floor(sg * warpedD / denom);
bool major = jj == 0; bool major = jj == 0;
bool ticked = Tick( dc, i, sg * step * denom, major, !major, tickSizes ); bool ticked = Tick( dc, ii, sg * step * denom, major, !major, tickSizes );
if( !major && !ticked ){ if( !major && !ticked ){
nDroppedMinorLabels++; nDroppedMinorLabels++;
} }
@@ -1192,7 +1190,7 @@ void Ruler::Update(
} }
steps++; steps++;
for(int i=0; i<=steps; i++) { for(int i=0; i<=steps; i++) {
for(j=start; j!=end; j+=mstep) { for(int j=start; j!=end; j+=mstep) {
val = decade * j; val = decade * j;
if(val >= rMin && val < rMax) { if(val >= rMin && val < rMax) {
const int pos(0.5 + mLength * numberScale.ValueToPosition(val)); const int pos(0.5 + mLength * numberScale.ValueToPosition(val));