Date: Thu, 25 Dec 2014 11:10:45 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375532 - head/games/fteqw/files Message-ID: <201412251110.sBPBAjPD042325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Dec 25 11:10:44 2014 New Revision: 375532 URL: https://svnweb.freebsd.org/changeset/ports/375532 QAT: https://qat.redports.org/buildarchive/r375532/ Log: Properly support png 1.5 Modified: head/games/fteqw/files/patch-client__image.c Modified: head/games/fteqw/files/patch-client__image.c ============================================================================== --- head/games/fteqw/files/patch-client__image.c Thu Dec 25 11:03:55 2014 (r375531) +++ head/games/fteqw/files/patch-client__image.c Thu Dec 25 11:10:44 2014 (r375532) @@ -1,15 +1,23 @@ ---- client/image.c.orig 2012-05-26 14:26:41.000000000 +0200 -+++ client/image.c 2012-05-26 14:27:18.000000000 +0200 -@@ -551,6 +551,8 @@ +--- client/image.c.orig 2014-12-25 11:05:11 UTC ++++ client/image.c +@@ -551,6 +551,7 @@ return NULL; #pragma comment(lib, "../libs/libpng.lib") #else #include <png.h> -+ #include <pngpriv.h> + #include <zlib.h> #endif #endif -@@ -610,7 +612,7 @@ +@@ -573,7 +574,7 @@ void PNGAPI png_default_read_data(png_st + + void VARGS readpngdata(png_structp png_ptr,png_bytep data,png_size_t len) + { +- pngreadinfo_t *ri = (pngreadinfo_t*)png_ptr->io_ptr; ++ pngreadinfo_t *ri = (pngreadinfo_t*)png_get_io_ptr(png_ptr); + if (ri->readposition+len > ri->filelen) + { + png_error(png_ptr, "unexpected eof"); +@@ -610,7 +611,7 @@ qbyte *ReadPNGFile(qbyte *buf, int lengt return (png_rgba = NULL); } @@ -18,7 +26,7 @@ { error: if (data) -@@ -636,7 +638,7 @@ +@@ -636,7 +637,7 @@ error: } if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8) @@ -27,7 +35,7 @@ if (png_get_valid( png, pnginfo, PNG_INFO_tRNS )) png_set_tRNS_to_alpha(png); -@@ -712,7 +714,7 @@ +@@ -712,7 +713,7 @@ int Image_WritePNG (char *filename, int return false; } @@ -36,7 +44,7 @@ png_destroy_write_struct(&png_ptr, &info_ptr); fclose(fp); return false; -@@ -879,7 +881,7 @@ +@@ -879,7 +880,7 @@ term_source (j_decompress_ptr cinfo) #define GLOBAL(x) x GLOBAL(void) @@ -45,7 +53,7 @@ { my_source_mgr *src; -@@ -945,7 +947,7 @@ +@@ -945,7 +946,7 @@ badjpeg: } jpeg_create_decompress(&cinfo); @@ -54,7 +62,7 @@ (void) jpeg_read_header(&cinfo, TRUE); -@@ -1041,7 +1043,7 @@ +@@ -1041,7 +1042,7 @@ METHODDEF(void) term_destination (j_comp dest->pub.free_in_buffer = OUTPUT_BUF_SIZE; } @@ -63,7 +71,7 @@ { my_destination_mgr *dest; -@@ -1101,7 +1103,7 @@ +@@ -1101,7 +1102,7 @@ void screenshotJPEG(char *filename, int buffer = screendata;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412251110.sBPBAjPD042325>