Merge branch 'master' of github.com:openlayers/ol3 into vector

Resolved conflicts:
  src/ol/renderer/canvas/canvasrenderer.js
This commit is contained in:
Tim Schaub
2013-02-20 00:38:07 -07:00
38 changed files with 1717 additions and 219 deletions

View File

@@ -84,7 +84,8 @@ ol.source.ImageSource.prototype.createImage =
var imageUrl = this.imageUrlFunction(extent, size);
if (goog.isDef(imageUrl)) {
image = new ol.Image(
extent, resolution, imageUrl, this.crossOrigin_);
extent, resolution, imageUrl, this.crossOrigin_,
this.getAttributions());
}
return image;
};