comparison layer/SpectrogramLayer.cpp @ 190:61681a2bc1e6

keep MIN and MAX compatibility (VC and linux compilation)

 
     if (!getXBinRange(v, x1, s10, s11)) {
         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;
 
     if (int(m_columnMags.size()) <= s1) {
         m_columnMags.resize(s1 + 1);

                 x1 = v->width();
             }
         }
             
         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 {
         if (x1 > x0 + paintBlockWidth) {
             int sfx = x1;