From 99127676dba8f5d607757428bc14a6b7ab52d5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 16 Dec 2016 12:42:06 +0100 Subject: [PATCH 1/3] fix negative shift constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Stolen from [1] [1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-left-shift-neg.patch Upstrem-Status: Pending Signed-off-by: Andreas Müller --- libaudiofile/modules/SimpleModule.h | 2 +- test/FloatToInt.cpp | 2 +- test/IntToFloat.cpp | 2 +- test/Sign.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h index 03c6c69..e4cc138 100644 --- a/libaudiofile/modules/SimpleModule.h +++ b/libaudiofile/modules/SimpleModule.h @@ -123,7 +123,7 @@ struct signConverter typedef typename IntTypes::UnsignedType UnsignedType; static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; - static const int kMinSignedValue = -1 << kScaleBits; + static const int kMinSignedValue = 0-(1U< { diff --git a/test/FloatToInt.cpp b/test/FloatToInt.cpp index 0d179a8..bf491b2 100644 --- a/test/FloatToInt.cpp +++ b/test/FloatToInt.cpp @@ -115,7 +115,7 @@ TEST_F(FloatToIntTest, Int16) EXPECT_EQ(readData[i], expectedData[i]); } -static const int32_t kMinInt24 = -1<<23; +static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; TEST_F(FloatToIntTest, Int24) diff --git a/test/IntToFloat.cpp b/test/IntToFloat.cpp index b716635..1d91b58 100644 --- a/test/IntToFloat.cpp +++ b/test/IntToFloat.cpp @@ -117,7 +117,7 @@ TEST_F(IntToFloatTest, Int16) EXPECT_EQ(readData[i], expectedData[i]); } -static const int32_t kMinInt24 = -1<<23; +static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; TEST_F(IntToFloatTest, Int24) diff --git a/test/Sign.cpp b/test/Sign.cpp index 7275399..c339514 100644 --- a/test/Sign.cpp +++ b/test/Sign.cpp @@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16) EXPECT_EQ(readData[i], expectedData[i]); } -static const int32_t kMinInt24 = -1<<23; +static const int32_t kMinInt24 = 0-(1U<<23); static const int32_t kMaxInt24 = (1<<23) - 1; static const uint32_t kMaxUInt24 = (1<<24) - 1; -- 2.7.4