From 6ca2fef0a3a61a36684f39400112776e6d119d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Fri, 22 Nov 2013 15:37:07 +0100
Subject: [PATCH] Always same format for color strings

---
 src/ol/render/canvas/canvas.js          | 16 +++++++++-------
 src/ol/render/canvas/canvasimmediate.js |  9 ++++-----
 src/ol/render/canvas/canvasreplay.js    | 14 ++++++--------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/ol/render/canvas/canvas.js b/src/ol/render/canvas/canvas.js
index f68931c454..ec08b3e89a 100644
--- a/src/ol/render/canvas/canvas.js
+++ b/src/ol/render/canvas/canvas.js
@@ -1,16 +1,18 @@
 goog.provide('ol.render.canvas');
 
-
-/**
- * @const {string}
- */
-ol.render.canvas.defaultFillStyle = 'black';
+goog.require('ol.color');
 
 
 /**
- * @const {string}
+ * @const {ol.Color}
  */
-ol.render.canvas.defaultStrokeStyle = 'black';
+ol.render.canvas.defaultFillStyle = ol.color.fromString('black');
+
+
+/**
+ * @const {ol.Color}
+ */
+ol.render.canvas.defaultStrokeStyle = ol.color.fromString('black');
 
 
 /**
diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js
index 05bda9980c..6293f2e30d 100644
--- a/src/ol/render/canvas/canvasimmediate.js
+++ b/src/ol/render/canvas/canvasimmediate.js
@@ -337,15 +337,14 @@ ol.render.canvas.Immediate.prototype.setFillStrokeStyle =
     function(fillStyle, strokeStyle) {
   var state = this.state_;
   if (!goog.isNull(fillStyle)) {
-    state.fillStyle = !goog.isNull(fillStyle.color) ?
-        ol.color.asString(fillStyle.color) : ol.render.canvas.defaultFillStyle;
+    state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
+        fillStyle.color : ol.render.canvas.defaultFillStyle);
   } else {
     state.fillStyle = undefined;
   }
   if (!goog.isNull(strokeStyle)) {
-    state.strokeStyle = !goog.isNull(strokeStyle.color) ?
-        ol.color.asString(strokeStyle.color) :
-            ol.render.canvas.defaultStrokeStyle;
+    state.strokeStyle = ol.color.asString(!goog.isNull(strokeStyle.color) ?
+        strokeStyle.color : ol.render.canvas.defaultStrokeStyle);
     state.lineWidth = goog.isDef(strokeStyle.width) ?
         strokeStyle.width : ol.render.canvas.defaultLineWidth;
   } else {
diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js
index 58edfc2801..e9861cc5cd 100644
--- a/src/ol/render/canvas/canvasreplay.js
+++ b/src/ol/render/canvas/canvasreplay.js
@@ -587,9 +587,8 @@ ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle =
   goog.asserts.assert(!goog.isNull(this.state_));
   goog.asserts.assert(goog.isNull(fillStyle));
   goog.asserts.assert(!goog.isNull(strokeStyle));
-  this.state_.strokeStyle = !goog.isNull(strokeStyle.color) ?
-      ol.color.asString(strokeStyle.color) :
-          ol.render.canvas.defaultStrokeStyle;
+  this.state_.strokeStyle = ol.color.asString(!goog.isNull(strokeStyle.color) ?
+      strokeStyle.color : ol.render.canvas.defaultStrokeStyle);
   this.state_.lineWidth = goog.isDef(strokeStyle.width) ?
       strokeStyle.width : ol.render.canvas.defaultLineWidth;
 };
@@ -737,15 +736,14 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle =
   goog.asserts.assert(!goog.isNull(fillStyle) || !goog.isNull(strokeStyle));
   var state = this.state_;
   if (!goog.isNull(fillStyle)) {
-    state.fillStyle = !goog.isNull(fillStyle.color) ?
-        ol.color.asString(fillStyle.color) : ol.render.canvas.defaultFillStyle;
+    state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
+        fillStyle.color : ol.render.canvas.defaultFillStyle);
   } else {
     state.fillStyle = undefined;
   }
   if (!goog.isNull(strokeStyle)) {
-    state.strokeStyle = !goog.isNull(strokeStyle.color) ?
-        ol.color.asString(strokeStyle.color) :
-            ol.render.canvas.defaultStrokeStyle;
+    state.strokeStyle = ol.color.asString(!goog.isNull(strokeStyle.color) ?
+        strokeStyle.color : ol.render.canvas.defaultStrokeStyle);
     state.lineWidth = goog.isDef(strokeStyle.width) ?
         strokeStyle.width : ol.render.canvas.defaultLineWidth;
   } else {