Skip to content

Commit 234b65d

Browse files
committed
Revert "Revert making for loop variable permanent."
This reverts commit 500711c.
1 parent 50fa508 commit 234b65d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/load_it.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
159159
DWORD patpos[MAX_PATTERNS];
160160
BYTE chnmask[64];//, channels_used[64]
161161
MODCOMMAND lastvalue[64];
162+
UINT j;
162163

163164
if ((!lpStream) || (dwMemLength < sizeof(ITFILEHEADER))) return FALSE;
164165
ITFILEHEADER pifh = *(ITFILEHEADER *)lpStream;
@@ -231,7 +232,7 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
231232
if (inspossize > MAX_INSTRUMENTS) inspossize = MAX_INSTRUMENTS;
232233
inspossize <<= 2;
233234
memcpy(inspos, lpStream+dwMemPos, inspossize);
234-
for (UINT j=0; j < (inspossize>>2); j++) {
235+
for (j=0; j < (inspossize>>2); j++) {
235236
inspos[j] = bswapLE32(inspos[j]);
236237
}
237238
dwMemPos += pifh.insnum * 4;
@@ -241,7 +242,7 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
241242
if (smppossize > MAX_SAMPLES) smppossize = MAX_SAMPLES;
242243
smppossize <<= 2;
243244
memcpy(smppos, lpStream+dwMemPos, smppossize);
244-
for (UINT j=0; j < (smppossize>>2); j++) {
245+
for (j=0; j < (smppossize>>2); j++) {
245246
smppos[j] = bswapLE32(smppos[j]);
246247
}
247248
dwMemPos += pifh.smpnum * 4;
@@ -251,7 +252,7 @@ BOOL CSoundFile::ReadIT(const BYTE *lpStream, DWORD dwMemLength)
251252
if (patpossize > MAX_PATTERNS) patpossize = MAX_PATTERNS;
252253
patpossize <<= 2;
253254
memcpy(patpos, lpStream+dwMemPos, patpossize);
254-
for (UINT j=0; j < (patpossize>>2); j++) {
255+
for (j=0; j < (patpossize>>2); j++) {
255256
patpos[j] = bswapLE32(patpos[j]);
256257
}
257258
dwMemPos += pifh.patnum * 4;

src/sndfile.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,17 +1392,18 @@ UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile,
13921392
// PTM 8bit delta to 16-bit sample
13931393
case RS_PTM8DTO16:
13941394
{
1395+
UINT j;
13951396
len = pIns->nLength * 2;
13961397
if (len > dwMemLength) break;
13971398
int8_t *pSample = (int8_t *)pIns->pSample;
13981399
int8_t delta8 = 0;
1399-
for (UINT j=0; j<len; j++)
1400+
for (j=0; j<len; j++)
14001401
{
14011402
delta8 += lpMemFile[j];
14021403
*pSample++ = delta8;
14031404
}
14041405
uint16_t *pSampleW = (uint16_t *)pIns->pSample;
1405-
for (UINT j=0; j<len; j+=2) // swaparoni!
1406+
for (j=0; j<len; j+=2) // swaparoni!
14061407
{
14071408
uint16_t rawSample = *pSampleW;
14081409
*pSampleW++ = bswapLE16(rawSample);

0 commit comments

Comments
 (0)