comparison data/fft/FFTFileCache.cpp @ 259:dc46851837d6

* Fix many compile warnings, remove some debug output

           (fileBase, mode, 
            storageType == Compact ? sizeof(uint16_t) : sizeof(float),
            mode == MatrixFile::ReadOnly)),
     m_storageType(storageType)
 {
-    std::cerr << "FFTFileCache: storage type is " << (storageType == Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << std::endl;
+//    std::cerr << "FFTFileCache: storage type is " << (storageType == Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << std::endl;
 }
 
 FFTFileCache::~FFTFileCache()
 {
     if (m_readbuf) delete[] m_readbuf;

     static float maxFactor = 0;
     if (factor > maxFactor) maxFactor = factor;
 //    std::cerr << "Normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl;
 
     if (m_storageType == Compact) {
-        ((uint16_t *)m_writebuf)[h * 2] = factor * 65535.0;
+        if (factor < 0.f || factor > 1.f) {
+            std::cerr << "WARNING: FFTFileCache::setColumnAt: Normalization factor " << factor << " out of range" << std::endl;
+            if (factor < 0.f) factor = 0.f;
+            if (factor > 1.f) factor = 1.f;
+        }
+        ((uint16_t *)m_writebuf)[h * 2] = (uint16_t)(factor * 65535.0);
     } else {
         ((float *)m_writebuf)[h * 2] = factor;
     }
     m_mfc->setColumnAt(x, m_writebuf);
 }