comparison src/scalar.c @ 246:bde5fa8692ff

Merge pull request #61 from seanlikeskites/master

MSVC fixes

     for(i = 0; i < n; i++)
     {
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             if(h == 1)
                 p1 += temp;
         }
     }
 

     for(i = 0; i < n; i++)
     {
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             switch (h)
             {
                 case 2:
                     p2 += temp;
                     break;

     for(i = 0; i < n; i++)
     {
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             if(h >= 5)
                 num += temp;
         }
     }
 

 
     while(n--)
     {
         if(amps[n])
         {
-            h = round(freqs[n] / fund);
+            h = floor(freqs[n] / fund + 0.5);
             num += fabs(freqs[n] - h * fund) * XTRACT_SQ(amps[n]);
             den += XTRACT_SQ(amps[n]);
         }
     }
 

 
     while(n--)
     {
         if((temp = data[n]))
         {
-            h = round(freqs[n] / fund);
+            h = floor(freqs[n] / fund + 0.5);
             if(XTRACT_IS_ODD(h))
             {
                 odd += temp;
             }
             else

     {
         /* Input data is too short. */
         *result = 0;
         return XTRACT_NO_RESULT;
     }
+
+    peak_index = 0;
 
     tempProduct = peak = 0;
     for (i = 0; i < M; ++i)
     {
         tempProduct = data [i] * data [i * 2] * data [i * 3];