ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-05-30 00:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into sdl2

Browse source
This commit is contained in:
Zack Middleton 2014-02-07 23:24:12 -06:00
commit ed087bb89e
320 changed files with 18335 additions and 9574 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/renderercommon/tr_image_jpg.c
View file

@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <jpeglib.h>
#ifndef USE_INTERNAL_JPEG
# if JPEG_LIB_VERSION < 80
# error Need system libjpeg >= 80
# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
# error Need system libjpeg >= 80 or jpeg_mem_ support
# endif
#endif

4
code/renderercommon/tr_image_png.c
View file

@ -2274,7 +2274,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height)
{
case PNG_ColourType_Grey :
{
if(!ChunkHeaderLength == 2)
if(ChunkHeaderLength != 2)
{
CloseBufferedFile(ThePNG);
@ -2296,7 +2296,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height)
case PNG_ColourType_True :
{
if(!ChunkHeaderLength == 6)
if(ChunkHeaderLength != 6)
{
CloseBufferedFile(ThePNG);