1*4882a593SmuzhiyunFrom 99127676dba8f5d607757428bc14a6b7ab52d5ed Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 3*4882a593SmuzhiyunDate: Fri, 16 Dec 2016 12:42:06 +0100 4*4882a593SmuzhiyunSubject: [PATCH 1/3] fix negative shift constants 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunStolen from [1] 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-left-shift-neg.patch 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpstrem-Status: Pending 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Andreas Müller <schnitzeltony@googlemail.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun libaudiofile/modules/SimpleModule.h | 2 +- 18*4882a593Smuzhiyun test/FloatToInt.cpp | 2 +- 19*4882a593Smuzhiyun test/IntToFloat.cpp | 2 +- 20*4882a593Smuzhiyun test/Sign.cpp | 2 +- 21*4882a593Smuzhiyun 4 files changed, 4 insertions(+), 4 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h 24*4882a593Smuzhiyunindex 03c6c69..e4cc138 100644 25*4882a593Smuzhiyun--- a/libaudiofile/modules/SimpleModule.h 26*4882a593Smuzhiyun+++ b/libaudiofile/modules/SimpleModule.h 27*4882a593Smuzhiyun@@ -123,7 +123,7 @@ struct signConverter 28*4882a593Smuzhiyun typedef typename IntTypes<Format>::UnsignedType UnsignedType; 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; 31*4882a593Smuzhiyun- static const int kMinSignedValue = -1 << kScaleBits; 32*4882a593Smuzhiyun+ static const int kMinSignedValue = 0-(1U<<kScaleBits); 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType> 35*4882a593Smuzhiyun { 36*4882a593Smuzhiyundiff --git a/test/FloatToInt.cpp b/test/FloatToInt.cpp 37*4882a593Smuzhiyunindex 0d179a8..bf491b2 100644 38*4882a593Smuzhiyun--- a/test/FloatToInt.cpp 39*4882a593Smuzhiyun+++ b/test/FloatToInt.cpp 40*4882a593Smuzhiyun@@ -115,7 +115,7 @@ TEST_F(FloatToIntTest, Int16) 41*4882a593Smuzhiyun EXPECT_EQ(readData[i], expectedData[i]); 42*4882a593Smuzhiyun } 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun-static const int32_t kMinInt24 = -1<<23; 45*4882a593Smuzhiyun+static const int32_t kMinInt24 = 0-(1U<<23); 46*4882a593Smuzhiyun static const int32_t kMaxInt24 = (1<<23) - 1; 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun TEST_F(FloatToIntTest, Int24) 49*4882a593Smuzhiyundiff --git a/test/IntToFloat.cpp b/test/IntToFloat.cpp 50*4882a593Smuzhiyunindex b716635..1d91b58 100644 51*4882a593Smuzhiyun--- a/test/IntToFloat.cpp 52*4882a593Smuzhiyun+++ b/test/IntToFloat.cpp 53*4882a593Smuzhiyun@@ -117,7 +117,7 @@ TEST_F(IntToFloatTest, Int16) 54*4882a593Smuzhiyun EXPECT_EQ(readData[i], expectedData[i]); 55*4882a593Smuzhiyun } 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun-static const int32_t kMinInt24 = -1<<23; 58*4882a593Smuzhiyun+static const int32_t kMinInt24 = 0-(1U<<23); 59*4882a593Smuzhiyun static const int32_t kMaxInt24 = (1<<23) - 1; 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun TEST_F(IntToFloatTest, Int24) 62*4882a593Smuzhiyundiff --git a/test/Sign.cpp b/test/Sign.cpp 63*4882a593Smuzhiyunindex 7275399..c339514 100644 64*4882a593Smuzhiyun--- a/test/Sign.cpp 65*4882a593Smuzhiyun+++ b/test/Sign.cpp 66*4882a593Smuzhiyun@@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16) 67*4882a593Smuzhiyun EXPECT_EQ(readData[i], expectedData[i]); 68*4882a593Smuzhiyun } 69*4882a593Smuzhiyun 70*4882a593Smuzhiyun-static const int32_t kMinInt24 = -1<<23; 71*4882a593Smuzhiyun+static const int32_t kMinInt24 = 0-(1U<<23); 72*4882a593Smuzhiyun static const int32_t kMaxInt24 = (1<<23) - 1; 73*4882a593Smuzhiyun static const uint32_t kMaxUInt24 = (1<<24) - 1; 74*4882a593Smuzhiyun 75*4882a593Smuzhiyun-- 76*4882a593Smuzhiyun2.7.4 77*4882a593Smuzhiyun 78