# HG changeset patch
# User Peter Meerwald <pmeerw@pmeerw.net>
# Date 1305047418 -7200
# Node ID 3819ecaf0f1412d0d2301f9ed48b7c6f90adf805
# Parent  fda7d3eda190c1f475647890a175829775eb2c3d
avoiding clash with latest libjpeg

diff -r fda7d3eda190 -r 3819ecaf0f14 Makefile
--- 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
+
diff -r fda7d3eda190 -r 3819ecaf0f14 jpg.c
--- 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;