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
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -69,7 +69,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
 */
 ol.renderer.canvas.ImageLayer.prototype.getImage = function() {
  return goog.isNull(this.image_) ?
-      null : this.image_.getImageElement();
+      null : this.image_.getImage();
 };