ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4164 from spatialillusions/patch-1

Browse Source
This commit is contained in:
Andreas Hocevar
2015-10-02 11:11:08 +02:00
parent 4cf1ee769e 2d7d002c85
commit faff14c44c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/style/iconstyle.js
+4 -1
View File
@@ -425,6 +425,9 @@ ol.style.IconImage_ = function(image, src, size, crossOrigin, imageState) {
* @type {boolean} * @type {boolean}
*/ */
this.tainting_ = false; this.tainting_ = false;
if (this.imageState_ == ol.style.ImageState.LOADED) {
this.determineTainting_();
}
}; };
goog.inherits(ol.style.IconImage_, goog.events.EventTarget); goog.inherits(ol.style.IconImage_, goog.events.EventTarget);
@@ -455,8 +458,8 @@ ol.style.IconImage_.get = function(image, src, size, crossOrigin, imageState) {
*/ */
ol.style.IconImage_.prototype.determineTainting_ = function() { ol.style.IconImage_.prototype.determineTainting_ = function() {
var context = ol.dom.createCanvasContext2D(1, 1); var context = ol.dom.createCanvasContext2D(1, 1);
context.drawImage(this.image_, 0, 0);
try { try {
context.drawImage(this.image_, 0, 0);
context.getImageData(0, 0, 1, 1); context.getImageData(0, 0, 1, 1);
} catch (e) { } catch (e) {
this.tainting_ = true; this.tainting_ = true;