Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cellPngDec: Ignore bytesPerLine < width * bpp.

Browse Source 
It seems strange, but Sonic CD passes bytesPerLine = w * 3 for a 4 channel
image.  Either this is a bug elsewhere, or it ignores likely incorrect
strides.

Untested except in Sonic CD.
This commit is contained in:
Unknown W. Brackets
2014-05-17 22:32:11 -07:00
parent 0e3e4c7553
commit fed2998d48
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp
+2 -2
View File
@@ -182,7 +182,7 @@ int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m
{ {
const char nComponents = current_outParam.outputColorSpace == CELL_PNGDEC_RGBA ? 4 : 3; const char nComponents = current_outParam.outputColorSpace == CELL_PNGDEC_RGBA ? 4 : 3;
image_size *= nComponents; image_size *= nComponents;
if (bytesPerLine != width * nComponents || flip) //check if we need padding if (bytesPerLine > width * nComponents || flip) //check if we need padding
{ {
const int linesize = std::min(bytesPerLine, width * nComponents); const int linesize = std::min(bytesPerLine, width * nComponents);
for (int i = 0; i < height; i++) for (int i = 0; i < height; i++)
@@ -203,7 +203,7 @@ int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m
{ {
const char nComponents = 4; const char nComponents = 4;
image_size *= nComponents; image_size *= nComponents;
if (bytesPerLine != width * nComponents || flip) //check if we need padding if (bytesPerLine > width * nComponents || flip) //check if we need padding
{ {
//TODO: find out if we can't do padding without an extra copy //TODO: find out if we can't do padding without an extra copy
const int linesize = std::min(bytesPerLine, width * nComponents); const int linesize = std::min(bytesPerLine, width * nComponents);