archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 07:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

memory viewer: fix RGB Image viewer crash

Browse source
This commit is contained in:
Megamouse 2020-12-18 00:31:09 +01:00
parent ec7963df3d
commit 112ac7bd13
1 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

65
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -447,62 +447,72 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format form
} }
const auto originalBuffer = vm::get_super_ptr<const uchar>(addr); const auto originalBuffer = vm::get_super_ptr<const uchar>(addr);
const auto convertedBuffer = static_cast<uchar*>(std::malloc(width * height * 4)); const auto convertedBuffer = static_cast<uchar*>(std::malloc(4ULL * width * height));
switch (format) switch (format)
{ {
case color_format::RGB: case color_format::RGB:
{ {
const u32 pitch = width * 3;
const u32 pitch_new = width * 4;
for (u32 y = 0; y < height; y++) for (u32 y = 0; y < height; y++)
{ {
for (u32 i = 0, j = 0; j < width * 4; i += 4, j += 3) const u32 offset = y * pitch;
const u32 offset_new = y * pitch_new;
for (u32 x = 0, x_new = 0; x < pitch; x += 3, x_new += 4)
{ {
convertedBuffer[i + 0 + y * width * 4] = originalBuffer[j + 2 + y * width * 3]; convertedBuffer[offset_new + x_new + 0] = originalBuffer[offset + x + 2];
convertedBuffer[i + 1 + y * width * 4] = originalBuffer[j + 1 + y * width * 3]; convertedBuffer[offset_new + x_new + 1] = originalBuffer[offset + x + 1];
convertedBuffer[i + 2 + y * width * 4] = originalBuffer[j + 0 + y * width * 3]; convertedBuffer[offset_new + x_new + 2] = originalBuffer[offset + x + 0];
convertedBuffer[i + 3 + y * width * 4] = 255; convertedBuffer[offset_new + x_new + 3] = 255;
} }
} }
break; break;
} }
case color_format::ARGB: case color_format::ARGB:
{ {
const u32 pitch = width * 4;
for (u32 y = 0; y < height; y++) for (u32 y = 0; y < height; y++)
{ {
for (u32 i = 0, j = 0; j < width * 4; i += 4, j += 4) const u32 offset = y * pitch;
for (u32 x = 0; x < pitch; x += 4)
{ {
convertedBuffer[i + 0 + y * width * 4] = originalBuffer[j + 3 + y * width * 4]; convertedBuffer[offset + x + 0] = originalBuffer[offset + x + 3];
convertedBuffer[i + 1 + y * width * 4] = originalBuffer[j + 2 + y * width * 4]; convertedBuffer[offset + x + 1] = originalBuffer[offset + x + 2];
convertedBuffer[i + 2 + y * width * 4] = originalBuffer[j + 1 + y * width * 4]; convertedBuffer[offset + x + 2] = originalBuffer[offset + x + 1];
convertedBuffer[i + 3 + y * width * 4] = originalBuffer[j + 0 + y * width * 4]; convertedBuffer[offset + x + 3] = originalBuffer[offset + x + 0];
} }
} }
break; break;
} }
case color_format::RGBA: case color_format::RGBA:
{ {
const u32 pitch = width * 4;
for (u32 y = 0; y < height; y++) for (u32 y = 0; y < height; y++)
{ {
for (u32 i = 0, j = 0; j < width * 4; i += 4, j += 4) const u32 offset = y * pitch;
for (u32 x = 0; x < pitch; x += 4)
{ {
convertedBuffer[i + 0 + y * width * 4] = originalBuffer[j + 2 + y * width * 4]; convertedBuffer[offset + x + 0] = originalBuffer[offset + x + 2];
convertedBuffer[i + 1 + y * width * 4] = originalBuffer[j + 1 + y * width * 4]; convertedBuffer[offset + x + 1] = originalBuffer[offset + x + 1];
convertedBuffer[i + 2 + y * width * 4] = originalBuffer[j + 0 + y * width * 4]; convertedBuffer[offset + x + 2] = originalBuffer[offset + x + 0];
convertedBuffer[i + 3 + y * width * 4] = originalBuffer[j + 3 + y * width * 4]; convertedBuffer[offset + x + 3] = originalBuffer[offset + x + 3];
} }
} }
break; break;
} }
case color_format::ABGR: case color_format::ABGR:
{ {
const u32 pitch = width * 4;
for (u32 y = 0; y < height; y++) for (u32 y = 0; y < height; y++)
{ {
for (u32 i = 0, j = 0; j < width * 4; i += 4, j += 4) const u32 offset = y * pitch;
for (u32 x = 0; x < pitch; x += 4)
{ {
convertedBuffer[i + 0 + y * width * 4] = originalBuffer[j + 1 + y * width * 4]; convertedBuffer[offset + x + 0] = originalBuffer[offset + x + 1];
convertedBuffer[i + 1 + y * width * 4] = originalBuffer[j + 2 + y * width * 4]; convertedBuffer[offset + x + 1] = originalBuffer[offset + x + 2];
convertedBuffer[i + 2 + y * width * 4] = originalBuffer[j + 3 + y * width * 4]; convertedBuffer[offset + x + 2] = originalBuffer[offset + x + 3];
convertedBuffer[i + 3 + y * width * 4] = originalBuffer[j + 0 + y * width * 4]; convertedBuffer[offset + x + 3] = originalBuffer[offset + x + 0];
} }
} }
break; break;
@ -514,18 +524,21 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format form
// Flip vertically // Flip vertically
if (flipv) if (flipv)
{ {
const u32 pitch = width * 4;
for (u32 y = 0; y < height / 2; y++) for (u32 y = 0; y < height / 2; y++)
{ {
for (u32 x = 0; x < width * 4; x++) const u32 offset = y * pitch;
const u32 flip_offset = (height - y - 1) * pitch;
for (u32 x = 0; x < pitch; x++)
{ {
const u8 t = convertedBuffer[x + y * width * 4]; const u8 tmp = convertedBuffer[offset + x];
convertedBuffer[x + y * width * 4] = convertedBuffer[x + (height - y - 1) * width * 4]; convertedBuffer[offset + x] = convertedBuffer[flip_offset + x];
convertedBuffer[x + (height - y - 1) * width * 4] = t; convertedBuffer[flip_offset + x] = tmp;
} }
} }
} }
QImage image = QImage(convertedBuffer, width, height, QImage::Format_ARGB32, [](void* buffer){ std::free(buffer); }, convertedBuffer); QImage image(convertedBuffer, width, height, QImage::Format_ARGB32, [](void* buffer){ std::free(buffer); }, convertedBuffer);
if (image.isNull()) return; if (image.isNull()) return;
QLabel* canvas = new QLabel(); QLabel* canvas = new QLabel();