MFH: r467442

graphics/freeimage: unbreak build with Clang 6 (C++14 by default)

Source/LibRawLite/./internal/dcraw_common.cpp:2042:17: error: constant expression evaluates to -2 which cannot be narrowed to type 'char' [-Wc++11-narrowing]
    1,0, 2,2, 2,-2,
                ^~
Source/LibRawLite/./internal/dcraw_common.cpp:2042:17: note: insert an explicit cast to silence this issue
    1,0, 2,2, 2,-2,
                ^~
                static_cast<char>( )
[...]

Reported by:	pkg-fallout (armv6, armv7, aarch64)
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-04-15 23:58:57 +00:00
parent e49995fa72
commit 3a7eced67e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=467445

View File

@ -1,7 +1,17 @@
https://github.com/LibRaw/LibRaw/commit/f4c0b98581a6
https://github.com/LibRaw/LibRaw/commit/2cef10389486
--- Source/LibRawLite/internal/dcraw_common.cpp.orig 2014-02-07 19:48:10 UTC
+++ Source/LibRawLite/internal/dcraw_common.cpp
@@ -2027,7 +2027,7 @@ void CLASS quicktake_100_load_raw()
void CLASS kodak_radc_load_raw()
{
- static const char src[] = {
+ static const signed char src[] = {
1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
@@ -3782,22 +3782,22 @@ void CLASS vng_interpolate()
-2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
-2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,