diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ios/app/mapboxgl-app.gyp | 3 | ||||
| -rw-r--r-- | src/mbgl/geometry/sprite_atlas.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -55,9 +55,11 @@ If you merely want to install the library for iOS and try it out as an Objective - `MapboxGL.bundle` is in your target's *Copy Bundle Resources* build phase. - `libMapboxGL.a` is in your target's *Link Binary With Libraries* build phase. 3. Add the following Cocoa framework dependencies to your target's *Link Binary With Libraries* build phase: + - `CoreTelephony.framework` - `GLKit.framework` - `ImageIO.framework` - `MobileCoreServices.framework` + - `QuartzCore.framework` - `SystemConfiguration.framework` - `libc++.dylib` - `libsqlite3.dylib` diff --git a/ios/app/mapboxgl-app.gyp b/ios/app/mapboxgl-app.gyp index 793ba6bce4..04207c5570 100644 --- a/ios/app/mapboxgl-app.gyp +++ b/ios/app/mapboxgl-app.gyp @@ -10,7 +10,8 @@ 'mac_bundle': 1, 'mac_bundle_resources': [ '<!@(find ./img -type f)', - './features.geojson' + './features.geojson', + './Settings.bundle/' ], 'dependencies': [ diff --git a/src/mbgl/geometry/sprite_atlas.cpp b/src/mbgl/geometry/sprite_atlas.cpp index bf31c6e38e..187253b147 100644 --- a/src/mbgl/geometry/sprite_atlas.cpp +++ b/src/mbgl/geometry/sprite_atlas.cpp @@ -73,7 +73,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::allocateImage(const size_t pixel_width // This is so we can scale down the texture coordinates and pack them // into 2 bytes rather than 4 bytes. const uint16_t pack_width = (pixel_width + 1) + (4 - (pixel_width + 1) % 4); - const uint16_t pack_height = (pixel_height + 1) + (4 - (pixel_width + 1) % 4); + const uint16_t pack_height = (pixel_height + 1) + (4 - (pixel_height + 1) % 4); // We have to allocate a new area in the bin, and store an empty image in it. // Add a 1px border around every image. |