diff options
Diffstat (limited to 'meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch')
| -rw-r--r-- | meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch deleted file mode 100644 index 0c2a8d4bd0..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marcus Meissner <marcus@jet.franken.de> | ||
| 3 | Date: Mon, 4 Dec 2023 13:26:08 +0100 | ||
| 4 | Subject: [PATCH] align outlen length with jpeg jeaders. fixes | ||
| 5 | https://github.com/gphoto/libgphoto2/issues/941 | ||
| 6 | |||
| 7 | --- | ||
| 8 | Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5] | ||
| 9 | |||
| 10 | camlibs/ptp2/chdk.c | 6 +++--- | ||
| 11 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c | ||
| 14 | index e1d898f378..e775ea1d4b 100644 | ||
| 15 | --- a/camlibs/ptp2/chdk.c | ||
| 16 | +++ b/camlibs/ptp2/chdk.c | ||
| 17 | @@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, | ||
| 18 | struct jpeg_error_mgr jerr; | ||
| 19 | JSAMPROW row_ptr[1]; | ||
| 20 | uint8_t *outbuf = NULL, *tmprowbuf = NULL; | ||
| 21 | - uint64_t outlen = 0; | ||
| 22 | + unsigned long outlen = 0; | ||
| 23 | unsigned int row_inc; | ||
| 24 | int sshift, dshift, xshift, skip; | ||
| 25 | |||
| 26 | @@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, | ||
| 27 | sshift = 6; | ||
| 28 | dshift = (width/height > 2) ? 6 : 12; | ||
| 29 | xshift = 4; | ||
| 30 | - /* Digic 6 cameras: 8 bit per element UYVY, | ||
| 31 | - * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ | ||
| 32 | + /* Digic 6 cameras: 8 bit per element UYVY, | ||
| 33 | + * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ | ||
| 34 | } else { | ||
| 35 | row_inc = buf_width*2; | ||
| 36 | sshift = 4; | ||
