comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftwf_malloc -> malloc MSVC fix 

Calling fftwf_malloc after the first init on Windows crashes?  malloc()
seems to be fine..
This commit is contained in:
Charles J. Cliffe 2015-12-31 00:25:05 -05:00
parent b4fc0ab8b9
commit 127f4ff87c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/process/SpectrumVisualProcessor.cpp
View File

@ -92,26 +92,30 @@ void SpectrumVisualProcessor::setup(int fftSize_in) {
if (fftwInput) { if (fftwInput) {
free(fftwInput); free(fftwInput);
} }
fftwInput = (fftwf_complex*) fftwf_malloc(memSize); //fftwInput = (fftwf_complex*) fftwf_malloc(memSize);
fftwInput = (fftwf_complex*)malloc(memSize);
memset(fftwInput,0,memSize); memset(fftwInput,0,memSize);
if (fftInData) { if (fftInData) {
free(fftInData); free(fftInData);
} }
fftInData = (fftwf_complex*) fftwf_malloc(memSize); //fftInData = (fftwf_complex*) fftwf_malloc(memSize);
fftInData = (fftwf_complex*)malloc(memSize);
memset(fftwInput,0,memSize); memset(fftwInput,0,memSize);
if (fftLastData) { if (fftLastData) {
free(fftLastData); free(fftLastData);
} }
fftLastData = (fftwf_complex*) fftwf_malloc(memSize); //fftLastData = (fftwf_complex*) fftwf_malloc(memSize);
fftLastData = (fftwf_complex*)malloc(memSize);
memset(fftwInput,0,memSize); memset(fftwInput,0,memSize);
if (fftwOutput) { if (fftwOutput) {
free(fftwOutput); free(fftwOutput);
} }
fftwOutput = (fftwf_complex*) fftwf_malloc(memSize); //fftwOutput = (fftwf_complex*) fftwf_malloc(memSize);
memset(fftwInput,0,memSize); fftwOutput = (fftwf_complex*)malloc(memSize);
memset(fftwInput,0,memSize);
if (fftw_plan) { if (fftw_plan) {
fftwf_destroy_plan(fftw_plan); fftwf_destroy_plan(fftw_plan);