1From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Wed, 31 Jan 2024 21:04:37 +0100
4Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build
5
6Fix the following libjpeg build failure raised since version 1.17.0 and
7https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39
8because third argument of jpeg_mem_dest is defined as size_t* on libjpeg
9instead of unsigned long* on jpeg-turbo:
10
11/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)':
12/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive]
13  366 |   jpeg_mem_dest(&cinfo, &outbuffer, &outlength);
14      |                                     ^~~~~~~~~~
15      |                                     |
16      |                                     long unsigned int*
17
18Fix #1008 and #1086
19
20Fixes:
21 - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727
22
23Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
24Upstream: https://github.com/strukturag/libheif/pull/1120
25---
26 libheif/plugins/encoder_jpeg.cc | 4 ++++
27 1 file changed, 4 insertions(+)
28
29diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc
30index d6c7854..21a5541 100644
31--- a/libheif/plugins/encoder_jpeg.cc
32+++ b/libheif/plugins/encoder_jpeg.cc
33@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image*
34   }
35
36   uint8_t* outbuffer = nullptr;
37+#ifdef LIBJPEG_TURBO_VERSION
38   unsigned long outlength = 0;
39+#else
40+  size_t outlength = 0;
41+#endif
42
43   jpeg_create_compress(&cinfo);
44   jpeg_mem_dest(&cinfo, &outbuffer, &outlength);
45--
462.43.0
47
48