mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-04 01:48:54 +00:00
29 lines
924 B
C
29 lines
924 B
C
--- ref_gl/gl_image.c.orig 2012-04-29 06:56:19.000000000 +0200
|
|
+++ ref_gl/gl_image.c 2012-04-29 06:56:40.000000000 +0200
|
|
@@ -20,6 +20,7 @@
|
|
|
|
#include "gl_local.h"
|
|
#include <png.h>
|
|
+#include <pngpriv.h>
|
|
#include <jpeglib.h>
|
|
|
|
image_t gltextures[MAX_GLTEXTURES];
|
|
@@ -1520,7 +1521,7 @@
|
|
cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
|
|
}
|
|
|
|
-void jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
|
|
+void local_jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
|
|
{
|
|
cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
|
|
cinfo->src->init_source = jpg_null;
|
|
@@ -1561,7 +1562,7 @@
|
|
|
|
cinfo.err = jpeg_std_error(&jerr);
|
|
jpeg_create_decompress(&cinfo);
|
|
- jpeg_mem_src(&cinfo, rawdata, rawsize);
|
|
+ local_jpeg_mem_src(&cinfo, rawdata, rawsize);
|
|
jpeg_read_header(&cinfo, true);
|
|
jpeg_start_decompress(&cinfo);
|
|
|