forked from macports/macports-ports
-
-
Notifications
You must be signed in to change notification settings - Fork 1
/
65878cb39f3d9a2e51cb248cdab9724824f80558.patch
37 lines (32 loc) · 1.69 KB
/
65878cb39f3d9a2e51cb248cdab9724824f80558.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 65878cb39f3d9a2e51cb248cdab9724824f80558 Mon Sep 17 00:00:00 2001
From: listout <listout@protonmail.com>
Date: Tue, 7 Mar 2023 13:27:46 +0530
Subject: [PATCH] Fix Fixes non-constant-expression cannot be narrowed from
type 'uint32_t' error with clang-16
Clang 16 (to be released appx. March 2023) will make the following default errors:
-Werror=implicit-function-declaration
-Werror=implicit-int
-Werror=int-conversion (this is in Clang 15, actually)
-Werror=incompatible-function-pointer-types (GCC does not have a specific equivalent error, use -Werror=incompatible-pointer-types instead when testing)
Building with Clang-16 results in build failure with
non-constant-expression cannot be narrowed from type 'uint32_t' error
with clang-16. Following what the compiler suggests, adding a
static_cast<int> helps suppress the error.
Signed-off-by: listout <brahmajit.xyz@gmail.com>
---
avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
index 41628dd347..a6a4834a3e 100644
--- avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
+++ avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp
@@ -637,8 +637,8 @@ void * ADMRGB32Scaler::planeWorker(void *argptr)
}
// resize plane
- int xs[4]={ADM_IMAGE_ALIGN(arg->srcWidth),0,0,0};
- int xd[4]={ADM_IMAGE_ALIGN(arg->dstWidth),0,0,0};
+ int xs[4]={static_cast<int>(ADM_IMAGE_ALIGN(arg->srcWidth)),0,0,0};
+ int xd[4]={static_cast<int>(ADM_IMAGE_ALIGN(arg->dstWidth)),0,0,0};
uint8_t *src[4]={NULL,NULL,NULL,NULL};
uint8_t *dst[4]={NULL,NULL,NULL,NULL};
src[0]=arg->iPlane;