Mercurial > mm7
diff mm7_2.cpp @ 1611:8e99b4a7176f
Слияние
author | Ritor1 |
---|---|
date | Sat, 14 Sep 2013 10:28:23 +0600 |
parents | c58916c53d8e |
children | 2c71fa8913d2 |
line wrap: on
line diff
--- a/mm7_2.cpp Sat Sep 14 10:28:13 2013 +0600 +++ b/mm7_2.cpp Sat Sep 14 10:28:23 2013 +0600 @@ -910,6 +910,7 @@ v231 = 0; if ( dstHeight <= 0 ) return result; + do { for (int counter = 0; counter < dstWidth; counter++) @@ -935,11 +936,11 @@ for(int i = 0; i < ratioDiff; i++) { if(field0value == 32) - v21 = _450FB1((int)v175[i]); + v21 = _450FB1(((int*)v175)[i]); else if(field0value == 16) - v21 = _450FB1((_WORD)v175[i]); + v21 = _450FB1(((_WORD*)v175)[i]); else - v21 = _450FB1((unsigned __int8)v175[i]); + v21 = _450FB1(((unsigned __int8*)v175)[i]); v240 += ((unsigned int)v21 >> 24); a6b += BYTE2(v21); v252 += BYTE1(v21);