diff layer/LinearColourScale.cpp @ 978:64c2b3a4435a 3.0-integration

Merge from branch osx-retina

--- a/layer/LinearColourScale.cpp	Fri Jun 26 14:10:18 2015 +0100
+++ b/layer/LinearColourScale.cpp	Fri Jun 26 14:10:40 2015 +0100
@@ -20,24 +20,24 @@
 
 #include <cmath>
 
-#include "view/View.h"
+#include "view/LayerGeometryProvider.h"
 
 int
-LinearColourScale::getWidth(View *,
+LinearColourScale::getWidth(LayerGeometryProvider *,
 			    QPainter &paint)
 {
     return paint.fontMetrics().width("-000.00") + 15;
 }
 
 void
-LinearColourScale::paintVertical(View *v,
+LinearColourScale::paintVertical(LayerGeometryProvider *v,
 				 const ColourScaleLayer *layer,
 				 QPainter &paint,
 				 int /* x0 */,
 				 double min,
 				 double max)
 {
-    int h = v->height();
+    int h = v->getPaintHeight();
 
     int n = 10;