# HG changeset patch
# User Chris Cannam
# Date 1435670182 -3600
# Node ID 50940a7425aec6309bb26156b6f5e155d71f3fa1
# Parent  66da6f009edd658211ef7fa5ceedf028a6d97f68# Parent  bc23c2cfff65112d2ed31ee870aff45e5fcae079
Merge

diff -r 66da6f009edd -r 50940a7425ae layer/Colour3DPlotLayer.cpp
--- a/layer/Colour3DPlotLayer.cpp	Tue Jun 30 14:14:34 2015 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Tue Jun 30 14:16:22 2015 +0100
@@ -869,7 +869,7 @@
         paint.save();
 
         QFont font = paint.font();
-        font.setPixelSize(font.pixelSize() * 0.65);
+        font.setPixelSize(int(font.pixelSize() * 0.65));
         paint.setFont(font);
 
         int msw = paint.fontMetrics().width(maxstr);
@@ -920,7 +920,7 @@
             if (paint.fontMetrics().height() >= h) {
                 if (h >= defaultFontHeight * 0.8) {
                     QFont tf = paint.font();
-                    tf.setPixelSize(h * 0.8);
+                    tf.setPixelSize(int(h * 0.8));
                     paint.setFont(tf);
                 } else {
                     continue;