Fixed: Converting AlphaLuminance to Luminance
This commit is contained in:
parent
0f4a307e18
commit
3ef42e9bd0
1 changed files with 7 additions and 8 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue