The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with versions of libpng older than 1.5

Browse Source
This commit is contained in:
JosJuice 2018-04-11 16:11:38 +02:00
parent c51ae9c62a
commit 10ff6d73c2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,14 @@
#include "Common/Image.h" #include "Common/Image.h"
// Versions of libpng older than 1.5 want us to not include setjmp.h before png.h,
// so let's include png.h first of all headers
#include <png.h>
#include <csetjmp> #include <csetjmp>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <memory> #include <memory>
#include <png.h>
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -87,7 +90,8 @@ static void PNGErrorCallback(png_structp png, png_const_charp error_msg)
bool LoadPNG(const std::vector<u8>& input, std::vector<u8>* data_out, u32* width_out, bool LoadPNG(const std::vector<u8>& input, std::vector<u8>* data_out, u32* width_out,
u32* height_out) u32* height_out)
{ {
const bool is_png = !png_sig_cmp(input.data(), 0, input.size()); // The const_cast is only required for libpng versions older than 1.5
const bool is_png = !png_sig_cmp(const_cast<u8*>(input.data()), 0, input.size());
if (!is_png) if (!is_png)
return false; return false;