Mercurial > hg > minimon
comparison 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 |
comparison
equal
deleted
inserted
replaced
5:fda7d3eda190 | 6:3819ecaf0f14 |
---|---|
55 | 55 |
56 *dest->outbuffer = dest->buffer; | 56 *dest->outbuffer = dest->buffer; |
57 *dest->outsize = dest->bufsize - dest->pub.free_in_buffer; | 57 *dest->outsize = dest->bufsize - dest->pub.free_in_buffer; |
58 } | 58 } |
59 | 59 |
60 static void jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) { | 60 static void my_jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) { |
61 mem_dest_mgr_ptr dest; | 61 mem_dest_mgr_ptr dest; |
62 | 62 |
63 if (outbuffer == NULL || outsize == NULL) /* sanity check */ | 63 if (outbuffer == NULL || outsize == NULL) /* sanity check */ |
64 ERREXIT(cinfo, JERR_BUFFER_SIZE); | 64 ERREXIT(cinfo, JERR_BUFFER_SIZE); |
65 | 65 |
104 | 104 |
105 jpg_buf_t jpg_buf; | 105 jpg_buf_t jpg_buf; |
106 jpg_buf.size = 1 << 20; | 106 jpg_buf.size = 1 << 20; |
107 jpg_buf.ptr = NULL; | 107 jpg_buf.ptr = NULL; |
108 | 108 |
109 jpeg_mem_dest(&cinfo, &jpg_buf.ptr, &jpg_buf.size); | 109 my_jpeg_mem_dest(&cinfo, &jpg_buf.ptr, &jpg_buf.size); |
110 | 110 |
111 cinfo.image_width = width; | 111 cinfo.image_width = width; |
112 cinfo.image_height = height; | 112 cinfo.image_height = height; |
113 cinfo.input_components = 3; | 113 cinfo.input_components = 3; |
114 cinfo.in_color_space = JCS_RGB; | 114 cinfo.in_color_space = JCS_RGB; |