Squashed 'libjamesdsp/subtree/' changes from a1bc9c1..5964dd2

timschneeb · timschneeb · commit 114ec7e90507 · 2023-07-16T02:14:47.000+02:00
5964dd2 Fix unreachable free

git-subtree-dir: libjamesdsp/subtree
git-subtree-split: 5964dd2a04950ae81eef0c78272ae093118bc449
diff --git a/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/multimodalEQ.c b/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/multimodalEQ.c
@@ -94,11 +94,11 @@ void HSHOResponse(double fs, double fc, unsigned int filterOrder, double gain, d
 			complexMultiplication(cplxRe[j], cplxIm[j], cplx2Re, cplx2Im, &cplxRe[j], &cplxIm[j]);
 		}
 	}
+scalar_gain:
 	free(sRe);
 	free(sIm);
 	free(s2Re);
 	free(s2Im);
-scalar_gain:
 	for (unsigned int j = 0; j < queryPts; j++)
 	{
 		cplxRe[j] *= overallGain;
@@ -279,4 +279,4 @@ void MultimodalEqualizerProcess(JamesDSPLib *jdsp, size_t n)
 			jdsp->tmpBuffer[1][smp] = x2;
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -94,11 +94,11 @@ void HSHOResponse(double fs, double fc, unsigned int filterOrder, double gain, d`
`94`	`94`	`complexMultiplication(cplxRe[j], cplxIm[j], cplx2Re, cplx2Im, &cplxRe[j], &cplxIm[j]);`
`95`	`95`	`}`
`96`	`96`	`}`
	`97`	`+scalar_gain:`
`97`	`98`	`free(sRe);`
`98`	`99`	`free(sIm);`
`99`	`100`	`free(s2Re);`
`100`	`101`	`free(s2Im);`
`101`		`-scalar_gain:`
`102`	`102`	`for (unsigned int j = 0; j < queryPts; j++)`
`103`	`103`	`{`
`104`	`104`	`cplxRe[j] *= overallGain;`
`@@ -279,4 +279,4 @@ void MultimodalEqualizerProcess(JamesDSPLib *jdsp, size_t n)`
`279`	`279`	`jdsp->tmpBuffer[1][smp] = x2;`
`280`	`280`	`}`
`281`	`281`	`}`
`282`		`-}`
	`282`	`+}`