comparison mm7_2.cpp @ 1908:cb1cbb969fce

Merge
author Grumpy7
date Mon, 21 Oct 2013 23:20:29 -0700
parents 39b6d789cbfc
children ab1c03cc2219
comparison
equal deleted inserted replaced
1907:1eb0515ff54b 1908:cb1cbb969fce
937 { 937 {
938 if(field0value == 32) 938 if(field0value == 32)
939 v21 = _450FB1(((int*)v175)[i]); 939 v21 = _450FB1(((int*)v175)[i]);
940 else if(field0value == 16) 940 else if(field0value == 16)
941 v21 = _450FB1(((_WORD*)v175)[i]); 941 v21 = _450FB1(((_WORD*)v175)[i]);
942 else 942 else if (field0value == 8)
943 v21 = _450FB1(((unsigned __int8*)v175)[i]); 943 v21 = _450FB1(((unsigned __int8*)v175)[i]);
944 v240 += ((unsigned int)v21 >> 24); 944 v240 += ((unsigned int)v21 >> 24);
945 a6b += BYTE2(v21); 945 a6b += BYTE2(v21);
946 v252 += BYTE1(v21); 946 v252 += BYTE1(v21);
947 v251 += (unsigned __int8)v21; 947 v251 += (unsigned __int8)v21;
948 } 948 }
949 if(field0value == 32) 949 if (field0value == 32)
950 v175 += 2 * srcPitch; 950 v175 += 2 * srcPitch;
951 else if(field0value == 16) 951 else if (field0value == 16)
952 v175 += srcPitch; 952 v175 += srcPitch;
953 else 953 else if (field0value == 8)
954 v175 = (unsigned short*)((char *)v175 + 2 * srcPitch); 954 v175 = (unsigned short*)((char *)v175 + 2 * srcPitch);
955 } 955 }
956 v22 = (unsigned int)v240 / ((heightRatioPlusOne - heightRatio) * (widthRatioPlusOne - widthRatio)); 956 v22 = (unsigned int)v240 / ((heightRatioPlusOne - heightRatio) * (widthRatioPlusOne - widthRatio));
957 if ( v19 ) 957 if ( v19 )
958 { 958 {