diff data/fileio/FFTFuzzyAdapter.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

--- a/data/fileio/FFTFuzzyAdapter.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/data/fileio/FFTFuzzyAdapter.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -43,10 +43,10 @@
 
     while (xratio > 1) {
         if (xratio & 0x1) {
-            std::cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio "
+            cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio "
                       << windowIncrement << " / "
                       << m_server->getWindowIncrement()
-                      << " must be a power of two" << std::endl;
+                      << " must be a power of two" << endl;
             assert(!(xratio & 0x1));
         }
         ++m_xshift;
@@ -55,9 +55,9 @@
 
     while (yratio > 1) {
         if (yratio & 0x1) {
-            std::cerr << "ERROR: FFTFuzzyAdapter: FFT size ratio "
+            cerr << "ERROR: FFTFuzzyAdapter: FFT size ratio "
                       << m_server->getFFTSize() << " / " << fftSize
-                      << " must be a power of two" << std::endl;
+                      << " must be a power of two" << endl;
             assert(!(yratio & 0x1));
         }
         ++m_yshift;