Mercurial > hg > easaier-soundaccess

diff layer/SpectrogramLayer.cpp @ 190:61681a2bc1e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep MIN and MAX compatibility (VC and linux compilation)
author lbajardsilogic
date Tue, 27 Nov 2007 13:26:04 +0000
parents d8e6709e9075
children be6d31baecb9
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/layer/SpectrogramLayer.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -1666,8 +1666,8 @@
         s10 = s11 = m_model->getEndFrame() / getWindowIncrement();
     }
 
-    int s0 = int(min(s00, s10) + 0.0001);
-    int s1 = int(max(s01, s11) + 0.0001);
+    int s0 = int(MIN(s00, s10) + 0.0001);
+    int s1 = int(MAX(s01, s11) + 0.0001);
 
 //    std::cerr << "SpectrogramLayer::updateViewMagnitudes: x0 = " << x0 << ", x1 = " << x1 << ", s00 = " << s00 << ", s11 = " << s11 << " s0 = " << s0 << ", s1 = " << s1 << std::endl;
 
@@ -1948,9 +1948,9 @@
         }
             
         cache.validArea = QRect
-            (min(vx0, x0), cache.validArea.y(),
-             max(vx1 - min(vx0, x0),
-                      x1 - min(vx0, x0)),
+            (MIN(vx0, x0), cache.validArea.y(),
+             MAX(vx1 - MIN(vx0, x0),
+                      x1 - MIN(vx0, x0)),
              cache.validArea.height());
             
     } else {