comparison base/ColumnOp.h @ 1197:fbe0fd84cb50 spectrogram-minor-refactor

Float/double conversion fixes

     typedef std::vector<float> Column;
 
     /**
      * Scale the given column using the given gain multiplier.
      */
-    static Column applyGain(const Column &in, float gain) {
-	
-	if (gain == 1.f) {
+    static Column applyGain(const Column &in, double gain) {
+	
+	if (gain == 1.0) {
 	    return in;
 	}
 	Column out;
 	out.reserve(in.size());
 	for (auto v: in) {
-	    out.push_back(v * gain);
+	    out.push_back(float(v * gain));
 	}
 	return out;
     }
 
     /**
      * Scale an FFT output by half the FFT size.
      */
     static Column fftScale(const Column &in, int fftSize) {
-        return applyGain(in, 2.f / float(fftSize));
+        return applyGain(in, 2.0 / fftSize);
     }
 
     /**
      * Determine whether an index points to a local peak.
      */

                 if (max > 0.f) {
                     scale = log10f(max + 1.f) / max;
                 }
             }
         }
-    
-	std::vector<float> out;
-	out.reserve(in.size());
-
-	for (auto v: in) {
-	    out.push_back(v * scale);
-	}
-        
-	return out;
+
+        return applyGain(in, scale);
     }
 
     /**
      * Distribute the given column into a target vector of a different
      * size, optionally using linear interpolation. The binfory vector