Remove code that suggests that color arrays may be modified

This commit is contained in:
Bart van den Eijnden
2014-12-04 09:24:18 +01:00
parent 22e33519c8
commit ccc7c1b9b7

View File

@@ -140,12 +140,11 @@ ol.color.equals = function(color1, color2) {
/**
* @param {string} s String.
* @param {ol.Color=} opt_color Color.
* @return {ol.Color} Color.
*/
ol.color.fromString = (
/**
* @return {function(string, ol.Color=): ol.Color}
* @return {function(string): ol.Color}
*/
function() {
@@ -172,10 +171,9 @@ ol.color.fromString = (
return (
/**
* @param {string} s String.
* @param {ol.Color=} opt_color Color.
* @return {ol.Color} Color.
*/
function(s, opt_color) {
function(s) {
var color;
if (cache.hasOwnProperty(s)) {
color = cache[s];
@@ -194,7 +192,7 @@ ol.color.fromString = (
cache[s] = color;
++cacheSize;
}
return ol.color.returnOrUpdate(color, opt_color);
return color;
});
})();
@@ -278,24 +276,6 @@ ol.color.normalize = function(color, opt_color) {
};
/**
* @param {ol.Color} color Color.
* @param {ol.Color=} opt_color Color.
* @return {ol.Color} Color.
*/
ol.color.returnOrUpdate = function(color, opt_color) {
if (goog.isDef(opt_color)) {
opt_color[0] = color[0];
opt_color[1] = color[1];
opt_color[2] = color[2];
opt_color[3] = color[3];
return opt_color;
} else {
return color;
}
};
/**
* @param {ol.Color} color Color.
* @return {string} String.