From 7353e05a9041a41c408c19ed81db595d2c5a593a Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Tue, 11 Jun 2013 09:45:09 +0200
Subject: [PATCH] Fixing merge errors from unmerging #404

---
 src/ol/renderer/canvas/canvasvectorrenderer.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ol/renderer/canvas/canvasvectorrenderer.js b/src/ol/renderer/canvas/canvasvectorrenderer.js
index a8f86d33e1..09edbf643d 100644
--- a/src/ol/renderer/canvas/canvasvectorrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorrenderer.js
@@ -276,14 +276,11 @@ ol.renderer.canvas.VectorRenderer.prototype.renderLabels_ =
       color = text.color,
       vecs, vec;
 
-  context.save();
-  context.scale(1, -1);
-
   if (color) {
     context.fillStyle = color;
   }
   if (goog.isDef(text.fontSize)) {
-    fontArray.push((text.fontSize * this.inverseScale_) + 'px');
+    fontArray.push(text.fontSize + 'px');
   }
   if (goog.isDef(text.fontFamily)) {
     fontArray.push(text.fontFamily);
@@ -305,7 +302,6 @@ ol.renderer.canvas.VectorRenderer.prototype.renderLabels_ =
     }
   }
 
-  context.restore();
 };