Merge branch 'master' of github.com:openlayers/ol3 into interim-tiles

2013-02-19 08:59:23 -07:00
parent e8c50c7290 a04774cd96
commit b061e23606
31 changed files with 1682 additions and 172 deletions
@@ -94,6 +94,7 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =

  if (!goog.isNull(this.image_)) {
    image = this.image_;
+
    var imageExtent = image.getExtent();
    var imageResolution = image.getResolution();
    var transform = this.transform_;
@@ -111,5 +112,7 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =
        (imageExtent.minX - viewCenter.x) / imageResolution,
        (viewCenter.y - imageExtent.maxY) / imageResolution,
        0);
+
+    this.updateAttributions(frameState.attributions, image.getAttributions());
  }
 };