Revert "Merge pull request #4344 from bartvde/issue-2844"

This reverts commit e5c44b37c9, reversing
changes made to 7f4c6e3634.
This commit is contained in:
Andreas Hocevar
2015-11-12 19:17:07 +01:00
parent bb5377fb8c
commit c5f4710b8d
13 changed files with 31 additions and 75 deletions

View File

@@ -14,7 +14,7 @@ goog.require('ol.extent');
* @constructor
* @extends {ol.ImageBase}
* @param {ol.Extent} extent Extent.
* @param {Array.<number>|undefined} resolution Resolution.
* @param {number|undefined} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {Array.<ol.Attribution>} attributions Attributions.
* @param {string} src Image source URI.
@@ -114,10 +114,7 @@ ol.Image.prototype.handleImageError_ = function() {
*/
ol.Image.prototype.handleImageLoad_ = function() {
if (this.resolution === undefined) {
this.resolution = [
ol.extent.getWidth(this.extent) / this.image_.width,
ol.extent.getHeight(this.extent) / this.image_.height
];
this.resolution = ol.extent.getHeight(this.extent) / this.image_.height;
}
this.state = ol.ImageState.LOADED;
this.unlistenImage_();