Added support for loading .png image files as textures and changed sc…

…reenshot command to write in .png format
RobertBeckebans · May 10, 2014 · 14f87fe · 14f87fe
1 parent 160a4dd
commit 14f87fe
Show file tree

Hide file tree

Showing 33 changed files with 34,444 additions and 49 deletions.
diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
@@ -1036,7 +1036,7 @@ set(RBDOOM3_INCLUDES
 			${RENDERER_OPENGL_INCLUDES}
 			#${IRRXML_INCLUDES}
 			${JPEG_INCLUDES}
-			#${PNG_INCLUDES}
+			${PNG_INCLUDES}
 			${ZLIB_INCLUDES}
 			${MINIZIP_INCLUDES}
 			${GLEW_INCLUDES}
@@ -1071,7 +1071,7 @@ set(RBDOOM3_SOURCES
 			${RENDERER_OPENGL_SOURCES}
 			#${IRRXML_SOURCES}
 			${JPEG_SOURCES}
-			#${PNG_SOURCES}
+			${PNG_SOURCES}
 			${ZLIB_SOURCES}
 			${MINIZIP_SOURCES}
 			${GLEW_SOURCES}
@@ -1255,7 +1255,7 @@ if(MSVC)
 	list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
 
 	set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
+	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
@@ -1373,7 +1373,7 @@ else()
 	list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
 
 	set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
+	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
 	list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)

diff --git a/neo/libs/png/ANNOUNCE b/neo/libs/png/ANNOUNCE
@@ -0,0 +1,55 @@
+
+Libpng 1.2.49 - March 29, 2012
+
+This is a public release of libpng, intended for use in production codes.
+
+Files available for download:
+
+Source files with LF line endings (for Unix/Linux) and with a
+"configure" script
+
+   libpng-1.2.49.tar.xz (LZMA-compressed, recommended)
+   libpng-1.2.49.tar.gz
+   libpng-1.2.49.tar.bz2
+
+Source files with LF line endings (for Unix/Linux) without the
+"configure" script
+
+   libpng-1.2.49-no-config.tar.xz (LZMA-compressed, recommended)
+   libpng-1.2.49-no-config.tar.gz
+   libpng-1.2.49-no-config.tar.bz2
+
+Source files with CRLF line endings (for Windows), without the
+"configure" script
+
+   lpng1249.zip
+   lpng1249.7z
+   lpng1249.tar.bz2
+
+Project files
+
+   libpng-1.2.49-project-netware.zip
+   libpng-1.2.49-project-wince.zip
+
+Other information:
+
+   libpng-1.2.49-README.txt
+   libpng-1.2.49-KNOWNBUGS.txt
+   libpng-1.2.49-LICENSE.txt
+   libpng-1.2.49-Y2K-compliance.txt
+   libpng-1.2.49-[previous version]-diff.txt
+
+Changes since the last public release (1.2.48):
+
+version 1.2.49 [March 29, 2012]
+
+  Revised png_set_text_2() to avoid potential memory corruption (fixes
+    CVE-2011-3048).
+  Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe) or to glennrp at users.sourceforge.net
+
+Glenn R-P