Merge pull request supercollider#127 from kisielk/warnings

Fix some clang build warnings
junk16 · Mar 12, 2017 · c918be8 · c918be8
2 parents d6253b1 + 7bf228a
commit c918be8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/source/BatUGens/BatPVUgens.cpp b/source/BatUGens/BatPVUgens.cpp
@@ -58,7 +58,7 @@
 		buf2 = world->mSndBufs + ibufnum2; \
 	} \
 	if (buf1->samples != buf2->samples) return; \
-	int numbins = buf1->samples - 2 >> 1;
+	int numbins = (buf1->samples - 2) >> 1;
 
 InterfaceTable *ft;
 

diff --git a/source/JoshUGens/JoshPVUGens.cpp b/source/JoshUGens/JoshPVUGens.cpp
@@ -1230,7 +1230,7 @@ void BinData_next(BinData *unit, int inNumSamples)
 	    World *world = unit->mWorld;
 	    if (ibufnum >= world->mNumSndBufs) ibufnum = 0;
 	    SndBuf *buf = world->mSndBufs + ibufnum;
-	    float fnumbins = (float)(buf->samples - 2 >> 1);
+	    float fnumbins = (float)((buf->samples - 2) >> 1);
 	    int bin = unit->m_bin;
 	    SCPolarBuf *p = ToPolarApx(buf);
 	    float sr = (float)unit->mWorld->mSampleRate; /* we need the audio rate... calc it here */
@@ -1758,7 +1758,7 @@ float wrapphase(float phase){
 		unit->m_buf = world->mSndBufs + bufnum; \
 	} \
 	SndBuf *buf = unit->m_buf; \
-	int numbins = buf->samples - 2 >> 1;
+	int numbins = (buf->samples - 2) >> 1;
 
 
 #define PV_DATA_INIT_READ \

diff --git a/source/MCLDUGens/MCLDFFTUGens.cpp b/source/MCLDUGens/MCLDFFTUGens.cpp
@@ -158,7 +158,7 @@ struct PV_ExtractRepeat : Unit {
 	} else { \
 		buf = world->mSndBufs + ibufnum; \
 	} \
-	int numbins = buf->samples - 2 >> 1;
+	int numbins = (buf->samples - 2) >> 1;
 
 // Same as above; but with "output2" as well as "output"
 #define FFTAnalyser_GET_BUF_TWOOUTS \
@@ -179,7 +179,7 @@ struct PV_ExtractRepeat : Unit {
 	} else { \
 		buf = world->mSndBufs + ibufnum; \
 	} \
-	int numbins = buf->samples - 2 >> 1;
+	int numbins = (buf->samples - 2) >> 1;
 
 // As above; but for operation on two input buffers
 #define FFTAnalyser_GET_BUF2 \
@@ -214,7 +214,7 @@ struct PV_ExtractRepeat : Unit {
 		buf2 = world->mSndBufs + ibufnum2; \
 	} \
 	if (buf1->samples != buf2->samples) return; \
-	int numbins = buf1->samples - 2 >> 1;
+	int numbins = (buf1->samples - 2) >> 1;
 
 // Copied from FFT_UGens.cpp
 #define MAKE_TEMP_BUF \
@@ -426,7 +426,7 @@ void FFTSubbandPower_next(FFTSubbandPower *unit, int inNumSamples)
 	} else {
 		buf = world->mSndBufs + ibufnum;
 	}
-	int numbins = buf->samples - 2 >> 1;
+	int numbins = (buf->samples - 2) >> 1;
 	// End: Multi-output equiv of FFTAnalyser_GET_BUF
 
 	int scalemode = unit->m_scalemode;
@@ -1108,7 +1108,7 @@ void PV_Whiten_next(PV_Whiten *unit, int inNumSamples){
 	} else {
 		buf2 = world->mSndBufs + ibufnum2;
 	}
-	int numbins = buf1->samples - 2 >> 1;
+	int numbins = (buf1->samples - 2) >> 1;
 //	Print("\nibufnum1: %d; ibufnum2: %d", ibufnum1, ibufnum2);
 //	if (buf1->samples != buf2->samples) return;
 
@@ -1213,7 +1213,7 @@ void FFTSubbandFlatness_next(FFTSubbandFlatness *unit, int inNumSamples)
 	} else {
 		buf = world->mSndBufs + ibufnum;
 	}
-	int numbins = buf->samples - 2 >> 1;
+	int numbins = (buf->samples - 2) >> 1;
 	// End: Multi-output equiv of FFTAnalyser_GET_BUF
 
 	// Now we create the integer lookup list, if it doesn't already exist

diff --git a/source/NCAnalysisUGens/SMS.cpp b/source/NCAnalysisUGens/SMS.cpp
@@ -89,7 +89,7 @@ SCPolarBuf* ToPolarApx2(float* buf, int windowsize=1024)
 	//assumes it already is complex format
 	//if (buf->coord == coord_Complex) {
 		SCComplexBuf* p = (SCComplexBuf*)buf;
-		int numbins = windowsize - 2 >> 1;
+		int numbins = (windowsize - 2) >> 1;
 		for (int i=0; i<numbins; ++i) {
 			p->bin[i].ToPolarApxInPlace();
 		}
@@ -102,7 +102,7 @@ SCComplexBuf* ToComplexApx2(float *buf, int windowsize=1024)
 {
 	//if (buf->coord == coord_Polar) {
 		SCPolarBuf* p = (SCPolarBuf*)buf; //->data;
-		int numbins = windowsize - 2 >> 1;
+		int numbins = (windowsize - 2) >> 1;
 		for (int i=0; i<numbins; ++i) {
 			p->bin[i].ToComplexApxInPlace();
 		}