diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 10:18:22 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 10:18:22 -0700 |
| commit | 4366775694b7404066e76280b79dd5026786e69d (patch) | |
| tree | 9d4e7e43ae8b61a09f684be6e4de9b5e4e683095 | |
| parent | 994777bf4bcded952eeab28d5ad1305a56ba5e29 (diff) | |
| parent | 6da602b5f5d8897834657c053727602aaa0e6fa9 (diff) | |
| download | sdl_ios-feature/issue_247_objc_generics.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/issue_247_objc_genericsfeature/issue_247_objc_generics
* origin/develop:
Revert "Changed deviceScale type to silence build warning"
| -rw-r--r-- | SmartDeviceLink/SDLLockScreenViewController.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m index aec0baf6c..eb2722207 100644 --- a/SmartDeviceLink/SDLLockScreenViewController.m +++ b/SmartDeviceLink/SDLLockScreenViewController.m @@ -168,7 +168,7 @@ NS_ASSUME_NONNULL_BEGIN + (UIImage*)sdl_imageWithName:(NSString*)name { if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) { NSString* bundlePath = [[NSBundle sdlBundle] bundlePath]; - int deviceScale = [[UIScreen mainScreen] scale]; + NSInteger deviceScale = [[UIScreen mainScreen] scale]; // We assume we are only dealing with PNGs. NSString* fileName = [NSString stringWithFormat:@"%@%i.png", name, deviceScale]; NSString* fullPath = [NSString stringWithFormat:@"%@/%@", bundlePath, fileName]; |