Update mask pixel format in panoply preview tool

This commit is contained in:
kaetemi 2016-01-15 17:22:27 +01:00
parent 2546b1385f
commit 3949cf2978

View file

@ -263,8 +263,8 @@ void CPanoplyPreview::goPushed(bool)
uint32 depth = m_ColorThread->MaskBitmap.load(is); uint32 depth = m_ColorThread->MaskBitmap.load(is);
if (depth == 0 || m_ColorThread->MaskBitmap.getPixels().empty()) if (depth == 0 || m_ColorThread->MaskBitmap.getPixels().empty())
throw NLMISC::Exception("Failed to load bitmap '%s'", m_MaskFile.toLocal8Bit().data()); throw NLMISC::Exception("Failed to load bitmap '%s'", m_MaskFile.toLocal8Bit().data());
if (m_ColorThread->MaskBitmap.PixelFormat != NLMISC::CBitmap::RGBA) if (m_ColorThread->MaskBitmap.PixelFormat != NLMISC::CBitmap::Luminance)
m_ColorThread->MaskBitmap.convertToType(NLMISC::CBitmap::RGBA); m_ColorThread->MaskBitmap.convertToType(NLMISC::CBitmap::Luminance);
} }
{ {
m_ColorThread->BitmapsOk = true; m_ColorThread->BitmapsOk = true;