Merge branch 'master' into libuv010

This commit is contained in:
Mike Morris
2014-09-24 15:40:08 -04:00
8 changed files with 178 additions and 173 deletions

View File

@@ -66,9 +66,12 @@ HeadlessView::HeadlessView() {
}
void HeadlessView::resize(int width, int height) {
void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) {
clear_buffers();
width *= pixelRatio;
height *= pixelRatio;
#if MBGL_USE_CGL
make_active();