diff layer/Colour3DPlotLayer.cpp @ 191:be6d31baecb9

compilation under linux - kunbuntu V7.10 (without video support)
author lbajardsilogic
date Wed, 28 Nov 2007 13:03:45 +0000
parents fc9323a41f5a
children
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Tue Nov 27 13:26:04 2007 +0000
+++ b/layer/Colour3DPlotLayer.cpp	Wed Nov 28 13:03:45 2007 +0000
@@ -324,7 +324,7 @@
 	}
     }
     if (another) {
-	tw = max(tw, paint.fontMetrics().width(sampleText));
+	tw = MAX(tw, paint.fontMetrics().width(sampleText));
     }
 
     return tw + 13 + getColourScaleWidth(paint);
@@ -734,7 +734,7 @@
                     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;
                 }
             }