Skip to content

Commit 14f87fe

Browse files
Added support for loading .png image files as textures and changed screenshot command to write in .png format
1 parent 160a4dd commit 14f87fe

33 files changed

+34444
-49
lines changed

neo/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ set(RBDOOM3_INCLUDES
10361036
${RENDERER_OPENGL_INCLUDES}
10371037
#${IRRXML_INCLUDES}
10381038
${JPEG_INCLUDES}
1039-
#${PNG_INCLUDES}
1039+
${PNG_INCLUDES}
10401040
${ZLIB_INCLUDES}
10411041
${MINIZIP_INCLUDES}
10421042
${GLEW_INCLUDES}
@@ -1071,7 +1071,7 @@ set(RBDOOM3_SOURCES
10711071
${RENDERER_OPENGL_SOURCES}
10721072
#${IRRXML_SOURCES}
10731073
${JPEG_SOURCES}
1074-
#${PNG_SOURCES}
1074+
${PNG_SOURCES}
10751075
${ZLIB_SOURCES}
10761076
${MINIZIP_SOURCES}
10771077
${GLEW_SOURCES}
@@ -1255,7 +1255,7 @@ if(MSVC)
12551255
list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
12561256

12571257
set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
1258-
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
1258+
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
12591259
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
12601260
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
12611261
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
@@ -1373,7 +1373,7 @@ else()
13731373
list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
13741374

13751375
set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
1376-
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
1376+
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
13771377
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
13781378
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
13791379
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)

neo/libs/png/ANNOUNCE

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
2+
Libpng 1.2.49 - March 29, 2012
3+
4+
This is a public release of libpng, intended for use in production codes.
5+
6+
Files available for download:
7+
8+
Source files with LF line endings (for Unix/Linux) and with a
9+
"configure" script
10+
11+
libpng-1.2.49.tar.xz (LZMA-compressed, recommended)
12+
libpng-1.2.49.tar.gz
13+
libpng-1.2.49.tar.bz2
14+
15+
Source files with LF line endings (for Unix/Linux) without the
16+
"configure" script
17+
18+
libpng-1.2.49-no-config.tar.xz (LZMA-compressed, recommended)
19+
libpng-1.2.49-no-config.tar.gz
20+
libpng-1.2.49-no-config.tar.bz2
21+
22+
Source files with CRLF line endings (for Windows), without the
23+
"configure" script
24+
25+
lpng1249.zip
26+
lpng1249.7z
27+
lpng1249.tar.bz2
28+
29+
Project files
30+
31+
libpng-1.2.49-project-netware.zip
32+
libpng-1.2.49-project-wince.zip
33+
34+
Other information:
35+
36+
libpng-1.2.49-README.txt
37+
libpng-1.2.49-KNOWNBUGS.txt
38+
libpng-1.2.49-LICENSE.txt
39+
libpng-1.2.49-Y2K-compliance.txt
40+
libpng-1.2.49-[previous version]-diff.txt
41+
42+
Changes since the last public release (1.2.48):
43+
44+
version 1.2.49 [March 29, 2012]
45+
46+
Revised png_set_text_2() to avoid potential memory corruption (fixes
47+
CVE-2011-3048).
48+
Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
49+
50+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
51+
(subscription required; visit
52+
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
53+
to subscribe) or to glennrp at users.sourceforge.net
54+
55+
Glenn R-P

0 commit comments

Comments
 (0)