piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9339 from AdmiralCurtiss/utf8-libpng

Browse Source 
Common: Write PNGs in two steps to allow Unicode target paths.
This commit is contained in:
LC 2020-12-19 21:43:05 -05:00 committed by GitHub
commit 2097de603c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Common/Image.cpp
View File

@ -10,6 +10,7 @@
#include <png.h>
#include "Common/CommonTypes.h"
#include "Common/File.h"
namespace Common
{
@ -47,22 +48,39 @@ bool SavePNG(const std::string& path, const u8* input, ImageByteFormat format, u
png.width = width;
png.height = height;
size_t byte_per_pixel;
switch (format)
{
case ImageByteFormat::RGB:
png.format = PNG_FORMAT_RGB;
byte_per_pixel = 3;
break;
case ImageByteFormat::RGBA:
png.format = PNG_FORMAT_RGBA;
byte_per_pixel = 4;
break;
default:
return false;
}
png_image_write_to_file(&png, path.c_str(), 0, input, stride, nullptr);
if (png.warning_or_error & PNG_IMAGE_ERROR)
// libpng doesn't handle non-ASCII characters in path, so write in two steps:
// first to memory, then to file
std::vector<u8> buffer(byte_per_pixel * width * height);
png_alloc_size_t size = buffer.size();
int success = png_image_write_to_memory(&png, buffer.data(), &size, 0, input, stride, nullptr);
if (!success && size > buffer.size())
{
// initial buffer size guess was too small, set to the now-known size and retry
buffer.resize(size);
png.warning_or_error = 0;
success = png_image_write_to_memory(&png, buffer.data(), &size, 0, input, stride, nullptr);
}
if (!success || (png.warning_or_error & PNG_IMAGE_ERROR) != 0)
return false;
return true;
File::IOFile outfile(path, "wb");
if (!outfile)
return false;
return outfile.WriteBytes(buffer.data(), size);
}
} // namespace Common