comparison data/fft/FFTMemoryCache.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author Chris Cannam
date Tue, 26 Nov 2013 13:35:08 +0000
parents 1469caaa8e67
children 59e7fe1b1003
comparison
equal deleted inserted replaced
842:23d3a6eca5c3 843:e802e550a1f2
33 m_fimag(0), 33 m_fimag(0),
34 m_factor(0), 34 m_factor(0),
35 m_storageType(storageType) 35 m_storageType(storageType)
36 { 36 {
37 #ifdef DEBUG_FFT_MEMORY_CACHE 37 #ifdef DEBUG_FFT_MEMORY_CACHE
38 std::cerr << "FFTMemoryCache[" << this << "]::FFTMemoryCache (type " 38 cerr << "FFTMemoryCache[" << this << "]::FFTMemoryCache (type "
39 << m_storageType << "), size " << m_width << "x" << m_height << std::endl; 39 << m_storageType << "), size " << m_width << "x" << m_height << endl;
40 #endif 40 #endif
41 41
42 initialise(); 42 initialise();
43 } 43 }
44 44
45 FFTMemoryCache::~FFTMemoryCache() 45 FFTMemoryCache::~FFTMemoryCache()
46 { 46 {
47 #ifdef DEBUG_FFT_MEMORY_CACHE 47 #ifdef DEBUG_FFT_MEMORY_CACHE
48 std::cerr << "FFTMemoryCache[" << this << "]::~FFTMemoryCache" << std::endl; 48 cerr << "FFTMemoryCache[" << this << "]::~FFTMemoryCache" << endl;
49 #endif 49 #endif
50 50
51 for (size_t i = 0; i < m_width; ++i) { 51 for (size_t i = 0; i < m_width; ++i) {
52 if (m_magnitude && m_magnitude[i]) free(m_magnitude[i]); 52 if (m_magnitude && m_magnitude[i]) free(m_magnitude[i]);
53 if (m_phase && m_phase[i]) free(m_phase[i]); 53 if (m_phase && m_phase[i]) free(m_phase[i]);
72 Profiler profiler("FFTMemoryCache::initialise"); 72 Profiler profiler("FFTMemoryCache::initialise");
73 73
74 size_t width = m_width, height = m_height; 74 size_t width = m_width, height = m_height;
75 75
76 #ifdef DEBUG_FFT_MEMORY_CACHE 76 #ifdef DEBUG_FFT_MEMORY_CACHE
77 std::cerr << "FFTMemoryCache[" << this << "]::initialise(" << width << "x" << height << " = " << width*height << ")" << std::endl; 77 cerr << "FFTMemoryCache[" << this << "]::initialise(" << width << "x" << height << " = " << width*height << ")" << endl;
78 #endif 78 #endif
79 79
80 if (m_storageType == FFTCache::Compact) { 80 if (m_storageType == FFTCache::Compact) {
81 initialise(m_magnitude); 81 initialise(m_magnitude);
82 initialise(m_phase); 82 initialise(m_phase);
94 94
95 m_width = width; 95 m_width = width;
96 m_height = height; 96 m_height = height;
97 97
98 #ifdef DEBUG_FFT_MEMORY_CACHE 98 #ifdef DEBUG_FFT_MEMORY_CACHE
99 std::cerr << "done, width = " << m_width << " height = " << m_height << std::endl; 99 cerr << "done, width = " << m_width << " height = " << m_height << endl;
100 #endif 100 #endif
101 } 101 }
102 102
103 void 103 void
104 FFTMemoryCache::initialise(uint16_t **&array) 104 FFTMemoryCache::initialise(uint16_t **&array)