Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-04 22:17:00 +01:00
parent b02956196d
commit e5a1249cb8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/nel/src/misc/bitmap.cpp
View file

@ -935,28 +935,27 @@ bool CBitmap::alphaToLuminance()
\*-------------------------------------------------------------------*/ \*-------------------------------------------------------------------*/
bool CBitmap::alphaLuminanceToLuminance() bool CBitmap::alphaLuminanceToLuminance()
{ {
uint32 i; if (_Width*_Height == 0) return false;
if(_Width*_Height == 0) return false; for(uint8 m = 0; m<_MipMapCount; ++m)
for(uint8 m= 0; m<_MipMapCount; m++)
{ {
CObjectVector<uint8> dataTmp; CObjectVector<uint8> dataTmp;
dataTmp.resize(_Data[m].size()/2); dataTmp.resize(_Data[m].size()/2);
uint dstId= 0; uint dstId= 0;
for(i=0; i<_Data[m].size(); i+=2) for(uint32 i=0; i<_Data[m].size(); i+=2)
{ {
dataTmp[dstId++]= 0;
dataTmp[dstId++]= 0;
dataTmp[dstId++]= 0;
dataTmp[dstId++]= _Data[m][i]; dataTmp[dstId++]= _Data[m][i];
} }
NLMISC::contReset(_Data[m]); NLMISC::contReset(_Data[m]);
_Data[m].resize(0); _Data[m].resize(0);
_Data[m] = dataTmp; _Data[m] = dataTmp;
} }
PixelFormat = Luminance; PixelFormat = Luminance;
return true; return true;
} }