diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2010-04-03 19:42:09 +0000 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2010-04-03 19:42:09 +0000 |
| commit | 7bcb89e0fac8085e079d7892ecaa42ca3d9a36fd (patch) | |
| tree | 5d54e7d741ae37cc4ac9c5913736b446cc9b9cd7 /camlibs/ax203/jpeg_memsrcdest.h | |
| parent | 08554bf1e22ce3c4cc69f03f89a10d6d1ac7c7e8 (diff) | |
| download | libgphoto2-7bcb89e0fac8085e079d7892ecaa42ca3d9a36fd.tar.gz | |
Make our jpeg_mem_* functions API compatible with the libjpeg8 versions
libjpeg8 ships with its own memory source and dest support (hurray!),
make our memory source and dest functions API compatible and only
implement them when building against an older libjpeg.
Thanks to Theodore Kilgore for pointing this out.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12899 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/ax203/jpeg_memsrcdest.h')
| -rw-r--r-- | camlibs/ax203/jpeg_memsrcdest.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h index 221491f02..e97118246 100644 --- a/camlibs/ax203/jpeg_memsrcdest.h +++ b/camlibs/ax203/jpeg_memsrcdest.h @@ -1,9 +1,9 @@ #include <jpeglib.h> void -jpeg_mem_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize); +jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + unsigned long bufsize); -void jpeg_mem_dest (j_compress_ptr cinfo); -int jpeg_mem_dest_get_final_image_size (j_compress_ptr cinfo); -JOCTET * jpeg_mem_dest_get_buffer (j_compress_ptr cinfo); -void jpeg_mem_dest_free_buffer (j_compress_ptr cinfo); +void +jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); |