comparison data/fft/FFTMemoryCache.cpp @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t

 #include <cstdlib>
 
 //#define DEBUG_FFT_MEMORY_CACHE 1
 
 FFTMemoryCache::FFTMemoryCache(FFTCache::StorageType storageType,
-                               size_t width, size_t height) :
+                               int width, int height) :
     m_width(width),
     m_height(height),
     m_magnitude(0),
     m_phase(0),
     m_fmagnitude(0),

 {
 #ifdef DEBUG_FFT_MEMORY_CACHE
     cerr << "FFTMemoryCache[" << this << "]::~FFTMemoryCache" << endl;
 #endif
 
-    for (size_t i = 0; i < m_width; ++i) {
+    for (int i = 0; i < m_width; ++i) {
 	if (m_magnitude && m_magnitude[i]) free(m_magnitude[i]);
 	if (m_phase && m_phase[i]) free(m_phase[i]);
 	if (m_fmagnitude && m_fmagnitude[i]) free(m_fmagnitude[i]);
 	if (m_fphase && m_fphase[i]) free(m_fphase[i]);
         if (m_freal && m_freal[i]) free(m_freal[i]);

 void
 FFTMemoryCache::initialise()
 {
     Profiler profiler("FFTMemoryCache::initialise");
 
-    size_t width = m_width, height = m_height;
+    int width = m_width, height = m_height;
 
 #ifdef DEBUG_FFT_MEMORY_CACHE
     cerr << "FFTMemoryCache[" << this << "]::initialise(" << width << "x" << height << " = " << width*height << ")" << endl;
 #endif
 

 {
     array = (uint16_t **)malloc(m_width * sizeof(uint16_t *));
     if (!array) throw std::bad_alloc();
     MUNLOCK(array, m_width * sizeof(uint16_t *));
 
-    for (size_t i = 0; i < m_width; ++i) {
+    for (int i = 0; i < m_width; ++i) {
 	array[i] = (uint16_t *)malloc(m_height * sizeof(uint16_t));
 	if (!array[i]) throw std::bad_alloc();
 	MUNLOCK(array[i], m_height * sizeof(uint16_t));
     }
 }

 {
     array = (float **)malloc(m_width * sizeof(float *));
     if (!array) throw std::bad_alloc();
     MUNLOCK(array, m_width * sizeof(float *));
 
-    for (size_t i = 0; i < m_width; ++i) {
+    for (int i = 0; i < m_width; ++i) {
 	array[i] = (float *)malloc(m_height * sizeof(float));
 	if (!array[i]) throw std::bad_alloc();
 	MUNLOCK(array[i], m_height * sizeof(float));
     }
 }
 
 void
-FFTMemoryCache::setColumnAt(size_t x, float *mags, float *phases, float factor)
+FFTMemoryCache::setColumnAt(int x, float *mags, float *phases, float factor)
 {
     Profiler profiler("FFTMemoryCache::setColumnAt: from polar");
 
     setNormalizationFactor(x, factor);
 
     if (m_storageType == FFTCache::Rectangular) {
         Profiler subprof("FFTMemoryCache::setColumnAt: polar to cart");
-        for (size_t y = 0; y < m_height; ++y) {
+        for (int y = 0; y < m_height; ++y) {
             m_freal[x][y] = mags[y] * cosf(phases[y]);
             m_fimag[x][y] = mags[y] * sinf(phases[y]);
         }
     } else {
-        for (size_t y = 0; y < m_height; ++y) {
+        for (int y = 0; y < m_height; ++y) {
             setMagnitudeAt(x, y, mags[y]);
             setPhaseAt(x, y, phases[y]);
         }
     }
 

     m_colset.set(x);
     m_colsetLock.unlock();
 }
 
 void
-FFTMemoryCache::setColumnAt(size_t x, float *reals, float *imags)
+FFTMemoryCache::setColumnAt(int x, float *reals, float *imags)
 {
     Profiler profiler("FFTMemoryCache::setColumnAt: from cart");
 
     float max = 0.0;
 
     switch (m_storageType) {
 
     case FFTCache::Rectangular:
-        for (size_t y = 0; y < m_height; ++y) {
+        for (int y = 0; y < m_height; ++y) {
             m_freal[x][y] = reals[y];
             m_fimag[x][y] = imags[y];
             float mag = sqrtf(reals[y] * reals[y] + imags[y] * imags[y]);
             if (mag > max) max = mag;
         }

 
     case FFTCache::Compact:
     case FFTCache::Polar:
     {
         Profiler subprof("FFTMemoryCache::setColumnAt: cart to polar");
-        for (size_t y = 0; y < m_height; ++y) {
+        for (int y = 0; y < m_height; ++y) {
             float mag = sqrtf(reals[y] * reals[y] + imags[y] * imags[y]);
             float phase = atan2f(imags[y], reals[y]);
             reals[y] = mag;
             imags[y] = phase;
             if (mag > max) max = mag;

     } else {
         setColumnAt(x, reals, imags, max);
     }
 }
 
-size_t
-FFTMemoryCache::getCacheSize(size_t width, size_t height, FFTCache::StorageType type)
-{
-    size_t sz = 0;
+int
+FFTMemoryCache::getCacheSize(int width, int height, FFTCache::StorageType type)
+{
+    int sz = 0;
 
     switch (type) {
 
     case FFTCache::Compact:
         sz = (height * 2 + 1) * width * sizeof(uint16_t);