Mercurial > hg > vamp-plugin-sdk

changeset 470:af4a1522ef15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings
author Chris Cannam
date Thu, 20 Oct 2016 14:05:05 +0100
parents a75fdb8b368c
children 59f7c7ae2f64
files src/vamp-hostsdk/PluginInputDomainAdapter.cpp src/vamp-sdk/ext/kiss_fft.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/vamp-hostsdk/PluginInputDomainAdapter.cpp	Fri Oct 14 17:00:34 2016 +0100
+++ b/src/vamp-hostsdk/PluginInputDomainAdapter.cpp	Thu Oct 20 14:05:05 2016 +0100
@@ -460,8 +460,8 @@
         Kiss::kiss_fftr(m_cfg, m_ri, m_cbuf);
         
         for (int i = 0; i <= m_blockSize/2; ++i) {
-            m_freqbuf[c][i * 2] = m_cbuf[i].r;
-            m_freqbuf[c][i * 2 + 1] = m_cbuf[i].i;
+            m_freqbuf[c][i * 2] = float(m_cbuf[i].r);
+            m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i].i);
         }
     }
 
@@ -509,8 +509,8 @@
         Kiss::kiss_fftr(m_cfg, m_ri, m_cbuf);
         
         for (int i = 0; i <= m_blockSize/2; ++i) {
-            m_freqbuf[c][i * 2] = m_cbuf[i].r;
-            m_freqbuf[c][i * 2 + 1] = m_cbuf[i].i;
+            m_freqbuf[c][i * 2] = float(m_cbuf[i].r);
+            m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i].i);
         }
     }
 
--- a/src/vamp-sdk/ext/kiss_fft.c	Fri Oct 14 17:00:34 2016 +0100
+++ b/src/vamp-sdk/ext/kiss_fft.c	Thu Oct 20 14:05:05 2016 +0100
@@ -223,7 +223,7 @@
             int twidx=0;
             Fout[ k ] = scratch[0];
             for (q=1;q<p;++q ) {
-                twidx += fstride * k;
+                twidx += int(fstride * k);
                 if (twidx>=Norig) twidx-=Norig;
                 C_MUL(t,scratch[q] , twiddles[twidx] );
                 C_ADDTO( Fout[ k ] ,t);