Remove duplicate function call. CL_Disconnect already does this.

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index 04419bd03551f29eca33ccb183ebca4f2437d787..c542dfeb46bb6219dfec35aeb6fcfe3e9c186bc0 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2006  Serge "(515)" Ziryukin, Forest "LordHavoc" Hale
+       Copyright (C) 2006  Serge "(515)" Ziryukin, Ashley Rose Hale (LadyHavoc)
 
        This program is free software; you can redistribute it and/or
        modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@
 //[515]: png implemented into DP ONLY FOR TESTING 2d stuff with csqc
 // so delete this bullshit :D
 //
-//LordHavoc: rewrote most of this.
+//LadyHavoc: rewrote most of this.
 
 #include "quakedef.h"
 #include "image.h"
@@ -254,7 +254,7 @@ static struct
        qfile_t *outfile;
 } my_png;
 
-//LordHavoc: removed __cdecl prefix, added overrun protection, and rewrote this to be more efficient
+//LadyHavoc: removed __cdecl prefix, added overrun protection, and rewrote this to be more efficient
 static void PNG_fReadData(void *png, unsigned char *data, size_t length)
 {
        size_t l;
@@ -516,6 +516,8 @@ qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height,
        if (setjmp((_JBTYPE *)png))
 #elif defined(MACOSX) || defined(WIN32)
        if (setjmp((int *)png))
+#elif defined(__ANDROID__)
+       if (setjmp((long *)png))
 #else
        if (setjmp((__jmp_buf_tag *)png))
 #endif