mirrors-yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC synced 2024-11-25 23:57:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small patch to fix loading of non-multiple-of-four images

Browse source
This commit is contained in:
Pavel Krajcevski 2014-04-02 13:59:08 -04:00
parent 640b098af7
commit ea1c61913a
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
IO/src/ImageLoader.cpp
View file

@ -75,6 +75,18 @@ void ReportError(const char *str) {
} }
unsigned int ImageLoader::GetChannelForPixel(uint32 x, uint32 y, uint32 ch) { unsigned int ImageLoader::GetChannelForPixel(uint32 x, uint32 y, uint32 ch) {
// First make sure that we're in bounds...
if(x >= GetWidth()) {
assert(!"Fix requirement that images have multiple-of-four dimensions");
return 0;
}
if(y >= GetHeight()) {
assert(!"Fix requirement that images have multiple-of-four dimensions");
return 0;
}
uint32 prec; uint32 prec;
const uint8 *data; const uint8 *data;
@ -107,9 +119,6 @@ unsigned int ImageLoader::GetChannelForPixel(uint32 x, uint32 y, uint32 ch) {
if(0 == prec) if(0 == prec)
return 0; return 0;
assert(x < GetWidth());
assert(y < GetHeight());
uint32 pixelIdx = y * GetWidth() + x; uint32 pixelIdx = y * GetWidth() + x;
const uint32 val = data[pixelIdx]; const uint32 val = data[pixelIdx];
@ -182,16 +191,15 @@ FasTC::Image<> *ImageLoader::LoadImage() {
m_Width = GetWidth(); m_Width = GetWidth();
m_Height = GetHeight(); m_Height = GetHeight();
// Create RGBA buffer
const unsigned int dataSz = 4 * m_Width * m_Height;
m_PixelData = new unsigned char[dataSz];
// Populate buffer in block stream order... make // Populate buffer in block stream order... make
// sure that width and height are aligned to multiples of four. // sure that width and height are aligned to multiples of four.
const unsigned int aw = ((m_Width + 3) >> 2) << 2; const unsigned int aw = ((m_Width + 3) >> 2) << 2;
const unsigned int ah = ((m_Height + 3) >> 2) << 2; const unsigned int ah = ((m_Height + 3) >> 2) << 2;
// Create RGBA buffer
const unsigned int dataSz = 4 * aw * ah;
m_PixelData = new unsigned char[dataSz];
#ifndef NDEBUG #ifndef NDEBUG
if(aw != m_Width || ah != m_Height) if(aw != m_Width || ah != m_Height)
fprintf(stderr, "Warning: Image dimension not multiple of four. " fprintf(stderr, "Warning: Image dimension not multiple of four. "
@ -242,6 +250,9 @@ FasTC::Image<> *ImageLoader::LoadImage() {
} }
} }
m_Width = aw;
m_Height = ah;
uint32 *pixels = reinterpret_cast<uint32 *>(m_PixelData); uint32 *pixels = reinterpret_cast<uint32 *>(m_PixelData);
return new FasTC::Image<>(m_Width, m_Height, pixels); return new FasTC::Image<>(m_Width, m_Height, pixels);
} }