Mercurial > hg > minimon
changeset 6:3819ecaf0f14
avoiding clash with latest libjpeg
| author | Peter Meerwald <pmeerw@pmeerw.net> |
|---|---|
| date | Tue, 10 May 2011 19:10:18 +0200 |
| parents | fda7d3eda190 |
| children | 5c00b239e1c8 |
| files | Makefile jpg.c |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue May 10 18:53:02 2011 +0200 +++ b/Makefile Tue May 10 19:10:18 2011 +0200 @@ -7,7 +7,8 @@ $(CC) $(CFLAGS) -I. -Wall -g -o $@ fbt.c jpg.c -ljpeg clean: - rm -f minimon + rm -f minimon fbt install: - + echo !!!!!!!!!!!1 $DESTDIR +
--- 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;