comparison layer/Colour3DPlotLayer.cpp @ 191:be6d31baecb9

compilation under linux - kunbuntu V7.10 (without video support)

 	    sampleText = m_model->getBinName(i);
             another = true;
 	}
     }
     if (another) {
-	tw = max(tw, paint.fontMetrics().width(sampleText));
+	tw = MAX(tw, paint.fontMetrics().width(sampleText));
     }
 
     return tw + 13 + getColourScaleWidth(paint);
 }
 

                     if (sx == sx1i) prop *= sx1 - sx;
                     if (sy == sy0i) prop *= (sy + 1) - sy0;
                     if (sy == sy1i) prop *= sy1 - sy;
 
                     mag += prop * m_cache->pixelIndex(scx, sy);
-                    max = max(max, m_cache->pixelIndex(scx, sy));
+                    max = MAX(max, m_cache->pixelIndex(scx, sy));
                     div += prop;
                 }
             }
 
             if (div != 0) mag /= div;