actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Keeping consistency between RS_Save_PNG and RS_Load_PNG

Browse Source
This commit is contained in:
Ben "root" Anderson
2013-10-29 22:29:05 -05:00
parent b64a766e0f
commit 62313006c1
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Load_PNG.cpp
-2
View File
@@ -5,8 +5,6 @@
#include "RageFile.h" #include "RageFile.h"
#include "RageSurface.h" #include "RageSurface.h"
#include <png.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "../extern/libpng/include/png.h" #include "../extern/libpng/include/png.h"
#pragma comment(lib, "libpng.lib") #pragma comment(lib, "libpng.lib")
src/RageSurface_Save_PNG.cpp
+4 -6
View File
@@ -6,15 +6,13 @@
#include "RageLog.h" #include "RageLog.h"
#include "RageUtil.h" #include "RageUtil.h"
#if defined(WINDOWS)
#include "png.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma comment(lib, "libpng.lib") #include "../extern/libpng/include/png.h"
#pragma comment(lib, "libpng.lib")
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */ #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#endif
#else #else
#include <../extern/libpng/include/png.h> #include <png.h>
#endif #endif // _MSC_VER
static void SafePngError( png_struct *pPng, const RString &sStr ) static void SafePngError( png_struct *pPng, const RString &sStr )
{ {