Mercurial > hg > minimon
diff jpg.c @ 6:3819ecaf0f14
avoiding clash with latest libjpeg
| author | Peter Meerwald <pmeerw@pmeerw.net> |
|---|---|
| date | Tue, 10 May 2011 19:10:18 +0200 |
| parents | e8957085fe8a |
| children | 66c77f9ba9b9 |
line wrap: on
line diff
--- a/jpg.c Tue May 10 18:53:02 2011 +0200 +++ b/jpg.c Tue May 10 19:10:18 2011 +0200 @@ -57,7 +57,7 @@ *dest->outsize = dest->bufsize - dest->pub.free_in_buffer; } -static void jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) { +static void my_jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) { mem_dest_mgr_ptr dest; if (outbuffer == NULL || outsize == NULL) /* sanity check */ @@ -106,7 +106,7 @@ jpg_buf.size = 1 << 20; jpg_buf.ptr = NULL; - jpeg_mem_dest(&cinfo, &jpg_buf.ptr, &jpg_buf.size); + my_jpeg_mem_dest(&cinfo, &jpg_buf.ptr, &jpg_buf.size); cinfo.image_width = width; cinfo.image_height = height;