From ddf5e48830ddca8b97154365c518b3ae726b83e1 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Wed, 15 Apr 2015 08:28:31 +0200 Subject: [PATCH] Make ol.size.toSize exportable and optimize it --- src/ol/size.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ol/size.js b/src/ol/size.js index 12d367d9f8..d2e008ab11 100644 --- a/src/ol/size.js +++ b/src/ol/size.js @@ -59,20 +59,25 @@ ol.size.scale = function(size, ratio, opt_size) { /** + * Returns an `ol.Size` array for the passed in number (meaning: square) or + * `ol.Size` array. + * (meaning: non-square), * @param {number|ol.Size} size Width and height. * @param {ol.Size=} opt_size Optional reusable size array. * @return {ol.Size} Size. + * @api stable */ ol.size.toSize = function(size, opt_size) { if (goog.isArray(size)) { return size; } else { - if (!goog.isDef(opt_size)) { - opt_size = [0, 0]; - } goog.asserts.assert(goog.isNumber(size)); - opt_size[0] = size; - opt_size[1] = size; + if (!goog.isDef(opt_size)) { + opt_size = [size, size]; + } else { + opt_size[0] = size; + opt_size[1] = size; + } return opt_size; } };