| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | --- libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h.orig 2016-06-15 09:03:20.625774684 -0400 |
| 2 | +++ libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h 2016-06-15 09:03:47.049774148 -0400 |
| 3 | @@ -1,5 +1,7 @@ |
| 4 | #include <jpeglib.h> |
| 5 | |
| 6 | +#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) |
| 7 | + |
| 8 | void |
| 9 | jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, |
| 10 | unsigned long bufsize); |
| 11 | @@ -7,3 +9,5 @@ |
| 12 | void |
| 13 | jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, |
| 14 | unsigned long * outsize); |
| 15 | + |
| 16 | +#endif |
| 17 | --- libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.c.orig 2016-06-15 09:03:58.689773913 -0400 |
| 18 | +++ libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.c 2016-06-15 09:04:17.769773526 -0400 |
| 19 | @@ -26,7 +26,7 @@ |
| 20 | |
| 21 | /* libjpeg8 and later come with their own (API compatible) memory source |
| 22 | and dest */ |
| 23 | -#if JPEG_LIB_VERSION < 80 |
| 24 | +#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) |
| 25 | |
| 26 | /* Expanded data source object for memory input */ |
| 27 | |
| 28 | --- libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.h.orig 2016-06-15 09:05:01.893772632 -0400 |
| 29 | +++ libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.h 2016-06-15 09:05:17.433772318 -0400 |
| 30 | @@ -1,5 +1,7 @@ |
| 31 | #include <jpeglib.h> |
| 32 | |
| 33 | +#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) |
| 34 | + |
| 35 | void |
| 36 | jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, |
| 37 | unsigned long bufsize); |
| 38 | @@ -7,3 +9,5 @@ |
| 39 | void |
| 40 | jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, |
| 41 | unsigned long * outsize); |
| 42 | + |
| 43 | +#endif |
| 44 | --- libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.c.orig 2016-06-15 09:04:42.641773022 -0400 |
| 45 | +++ libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.c 2016-06-15 09:04:48.657772901 -0400 |
| 46 | @@ -26,7 +26,7 @@ |
| 47 | |
| 48 | /* libjpeg8 and later come with their own (API compatible) memory source |
| 49 | and dest */ |
| 50 | -#if JPEG_LIB_VERSION < 80 |
| 51 | +#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) |
| 52 | |
| 53 | /* Expanded data source object for memory input */ |
| 54 | |