forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-libs/smpeg2: fix build failure against gcc-6, bug #594912
Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/594912 Package-Manager: Portage-2.3.3, Repoman-2.3.1
- Loading branch information
Sergei Trofimovich
committed
Feb 27, 2017
1 parent
09b9aa6
commit b0465fe
Showing
2 changed files
with
24 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
gcc-6 is more strict WRT narrowing: | ||
error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing] | ||
|
||
https://bugs.gentoo.org/594912 | ||
diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp | ||
index 6bc8e86..5414ae3 100644 | ||
--- a/audio/hufftable.cpp | ||
+++ b/audio/hufftable.cpp | ||
@@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]= | ||
{ | ||
- { 0, 0-1, 0-1, 0, 0, htd33}, | ||
+ { 0, ~0u, ~0u, 0, 0, htd33}, | ||
{ 1, 2-1, 2-1, 0, 7,htd01}, | ||
@@ -556,3 +556,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]= | ||
{ 3, 3-1, 3-1, 0, 17,htd03}, | ||
- { 4, 0-1, 0-1, 0, 0, htd33}, | ||
+ { 4, ~0u, ~0u, 0, 0, htd33}, | ||
{ 5, 4-1, 4-1, 0, 31,htd05}, | ||
@@ -566,3 +566,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]= | ||
{13,16-1,16-1, 0,511,htd13}, | ||
- {14, 0-1, 0-1, 0, 0, htd33}, | ||
+ {14,~0u, ~0u, 0, 0, htd33}, | ||
{15,16-1,16-1, 0,511,htd15}, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters