Skip to content

Make sure icons show up in Safari #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2016
Merged

Make sure icons show up in Safari #4659

merged 1 commit into from
Jan 12, 2016

Conversation

bartvde
Copy link
Member

@bartvde bartvde commented Jan 12, 2016

Make sure that drawImage calls don't exceed source image dimensions.

Fixed #4337 thanks to @ahocevar for his help on this one.

context.drawImage(image, originX, originY, width, height,
x, y, width * pixelRatio, height * pixelRatio);
var w = (width + originX > image.width) ? image.width - originX : width;
var h = (height + originY > image.height) ? image.height - originY : height;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra space here: height + originY

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's what I get for copy paste from Slack ;-)
not caught by make check btw

@ahocevar
Copy link
Member

Thanks for the additional rendering tests. Only one minor comment above.

Please merge when Travis is happy.

Make sure that drawImage calls don't exceed source image dimensions.
bartvde added a commit that referenced this pull request Jan 12, 2016
@bartvde bartvde merged commit 3f5a808 into openlayers:master Jan 12, 2016
@bartvde bartvde deleted the drawimage-safari-fix branch January 12, 2016 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants