mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
41 lines
1.2 KiB
Plaintext
41 lines
1.2 KiB
Plaintext
From 22fc03245957de878b2c4f6ecd22fa928826ea5f Mon Sep 17 00:00:00 2001
|
||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||
Date: Wed, 28 Dec 2022 16:26:01 -0300
|
||
Subject: Fix -Wnarroring error.
|
||
|
||
error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { }
|
||
|
||
Patch taken from Gentoo's patch for GCC 6.
|
||
|
||
|
||
diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
|
||
index 6bc8e86..5414ae3 100644
|
||
--- a/audio/hufftable.cpp
|
||
+++ b/audio/hufftable.cpp
|
||
@@ -550,11 +550,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, 1},{ 2, 1},{ 0, 0},{ 0, 1},
|
||
|
||
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},
|
||
{ 2, 3-1, 3-1, 0, 17,htd02},
|
||
{ 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},
|
||
{ 6, 4-1, 4-1, 0, 31,htd06},
|
||
{ 7, 6-1, 6-1, 0, 71,htd07},
|
||
@@ -564,7 +564,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
|
||
{11, 8-1, 8-1, 0,127,htd11},
|
||
{12, 8-1, 8-1, 0,127,htd12},
|
||
{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},
|
||
{16,16-1,16-1, 1,511,htd16},
|
||
{17,16-1,16-1, 2,511,htd16},
|
||
--
|
||
2.37.3
|
||
|