From c657cd54baee3bdfe7a92c9b91536bb5c3ddcdd8 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 24 Oct 2022 17:50:17 +0100 Subject: [PATCH 2/5] Fix clash with libjpeg --- a/src/ref_gl/gl_image.c +++ b/src/ref_gl/gl_image.c @@ -912,7 +912,7 @@ jpg_skip_input_data(j_decompress_ptr cinfo, long num_bytes) } void -jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len) +qudos_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; @@ -956,7 +956,7 @@ LoadJPG(char *filename, byte ** pic, int *width, int *height) jpeg_create_decompress(&cinfo); /* Feed JPEG memory into the libJpeg Object */ - jpeg_mem_src(&cinfo, rawdata, rawsize); + qudos_jpeg_mem_src(&cinfo, rawdata, rawsize); /* Process JPEG header */ jpeg_read_header(&cinfo, true);