Common: Write PNGs in two steps to allow Unicode target paths.

This commit is contained in:
Admiral H. Curtiss 2020-12-19 17:21:58 +01:00
parent eb6fd56c1d
commit 5bbd5fce2f
1 changed files with 21 additions and 3 deletions

View File

@ -10,6 +10,7 @@
#include <png.h> #include <png.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/File.h"
namespace Common namespace Common
{ {
@ -47,22 +48,39 @@ bool SavePNG(const std::string& path, const u8* input, ImageByteFormat format, u
png.width = width; png.width = width;
png.height = height; png.height = height;
size_t byte_per_pixel;
switch (format) switch (format)
{ {
case ImageByteFormat::RGB: case ImageByteFormat::RGB:
png.format = PNG_FORMAT_RGB; png.format = PNG_FORMAT_RGB;
byte_per_pixel = 3;
break; break;
case ImageByteFormat::RGBA: case ImageByteFormat::RGBA:
png.format = PNG_FORMAT_RGBA; png.format = PNG_FORMAT_RGBA;
byte_per_pixel = 4;
break; break;
default: default:
return false; return false;
} }
png_image_write_to_file(&png, path.c_str(), 0, input, stride, nullptr); // libpng doesn't handle non-ASCII characters in path, so write in two steps:
if (png.warning_or_error & PNG_IMAGE_ERROR) // 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 false;
return true; File::IOFile outfile(path, "wb");
if (!outfile)
return false;
return outfile.WriteBytes(buffer.data(), size);
} }
} // namespace Common } // namespace Common