diff options
Diffstat (limited to 'media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch')
-rw-r--r-- | media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch b/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch new file mode 100644 index 000000000000..10fb38d6d658 --- /dev/null +++ b/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch @@ -0,0 +1,64 @@ +Bug: https://bugs.gentoo.org/600380 + +--- a/bardecode/code25i.hh ++++ b/bardecode/code25i.hh +@@ -21,6 +21,12 @@ + + #include "scanner_utils.hh" + ++#if __cplusplus >= 201103L ++#define STATIC_CONST_DOUBLE static constexpr double ++#else ++#define STATIC_CONST_DOUBLE static const double ++#endif ++ + namespace BarDecode + { + struct code25i_t +@@ -31,11 +37,11 @@ + static const int END_SEQUENCE = 0xD; + static const char no_entry = 0; + +- static const double n_lq = 15; +- static const double n_hq = 5.3; +- static const double w_lq = 5.2; +- static const double w_hq = 1.5; +- static const double tol = 0.2; ++ STATIC_CONST_DOUBLE n_lq = 15; ++ STATIC_CONST_DOUBLE n_hq = 5.3; ++ STATIC_CONST_DOUBLE w_lq = 5.2; ++ STATIC_CONST_DOUBLE w_hq = 1.5; ++ STATIC_CONST_DOUBLE tol = 0.2; + + static const usize_t min_quiet_usize = 5; + //static const usize_t min_quiet_usize = 10; +--- a/codecs/dcraw.h ++++ b/codecs/dcraw.h +@@ -3958,22 +3958,22 @@ + -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, + -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, +- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, +- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, ++ -1,-2,-1,+0,0,(signed char) 0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, ++ -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char) 0x88, -1,-1,+1,-2,0,0x40, + -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, + -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, + -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, + -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, + -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, + -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, +- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ++ +0,-2,+0,+0,1,(signed char) 0x80, +0,-1,+0,+1,1,(signed char) 0x88, +0,-1,+1,-2,0,0x40, + +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, + +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, + +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, + +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, + +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, +- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, +- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, ++ +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char) 0x80, ++ +1,-1,+1,+1,0,(signed char) 0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, + +1,+0,+2,+1,0,0x10 + }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; + ushort (*brow[5])[4], *pix; |