Merge remote-tracking branch 'upstream/master' into webgl-point

2014-11-03 15:02:22 +01:00
parent 787f98c5f2 bf43816b66
commit 46b03e79a4
53 changed files with 2164 additions and 1024 deletions
@@ -129,7 +129,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame =
        (imageExtent[0] - viewCenter[0]) / imageResolution,
        (viewCenter[1] - imageExtent[3]) / imageResolution);
    if (image != this.image_) {
-      var imageElement = image.getImageElement(this);
+      var imageElement = image.getImage(this);
      // Bootstrap sets the style max-width: 100% for all images, which breaks
      // prevents the image from being displayed in FireFox.  Workaround by
      // overriding the max-width style.