blob: 7af1e9e2b9023ada30524a505ea060cc61b22174 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Fri, 4 Jan 2019 10:52:11 -0600
Subject: [PATCH] Fix PNG usage without preprocessor check.
---
shaders/shader_helpers.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp
index b84e6291..a589d39b 100644
--- a/shaders/shader_helpers.cpp
+++ b/shaders/shader_helpers.cpp
@@ -93,6 +93,7 @@ bool loadPngImage(const char* name,
bool& outHasAlpha,
GLubyte** outData)
{
+#ifdef HAVE_LIBPNG
png_structp png_ptr;
png_infop info_ptr;
unsigned int sig_read = 0;
@@ -211,6 +212,9 @@ bool loadPngImage(const char* name,
/* That's it */
return true;
+#else
+ return false;
+#endif
}
bool loadTGA(const char* filename, STGA& tgaFile)
|