diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2020-04-17 08:41:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 08:41:24 -0400 |
| commit | fa068d3b42f7e9ec2bfb6c7d37411b391b2d9200 (patch) | |
| tree | 2d8c7cda986c9afd43042c5e0d35a0386cb54277 | |
| parent | f063aada6fb41a465d2469ef81aec00a6c8de9a5 (diff) | |
| parent | e46028dc0899ffb4788ba50ebccd2cebf94039a3 (diff) | |
| download | sdl_ios-fa068d3b42f7e9ec2bfb6c7d37411b391b2d9200.tar.gz | |
Merge pull request #1626 from smartdevicelink/bugfix/issue-1625-sdlimagefield-imageresolution-init-nullable
Fix SDLImageField nullability of initializer parameter
| -rw-r--r-- | SmartDeviceLink/SDLImageField.h | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLImageField.m | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SmartDeviceLink/SDLImageField.h b/SmartDeviceLink/SDLImageField.h index 717ab935b..610b1a55c 100644 --- a/SmartDeviceLink/SDLImageField.h +++ b/SmartDeviceLink/SDLImageField.h @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param name The name identifying this image field /// @param imageTypeSupported The image data types this field supports /// @param imageResolution The native resolution of this image field -- (instancetype)initWithName:(SDLImageFieldName)name imageTypeSupported:(NSArray<SDLFileType> *)imageTypeSupported imageResolution:(SDLImageResolution *)imageResolution; +- (instancetype)initWithName:(SDLImageFieldName)name imageTypeSupported:(NSArray<SDLFileType> *)imageTypeSupported imageResolution:(nullable SDLImageResolution *)imageResolution; @end diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index f0fc0e4c5..85532ff80 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN return [self.store sdl_objectForName:SDLRPCParameterNameImageResolution ofClass:SDLImageResolution.class error:nil]; } -- (instancetype)initWithName:(SDLImageFieldName)name imageTypeSupported:(NSArray<SDLFileType> *)imageTypeSupported imageResolution:(SDLImageResolution *)imageResolution { +- (instancetype)initWithName:(SDLImageFieldName)name imageTypeSupported:(NSArray<SDLFileType> *)imageTypeSupported imageResolution:(nullable SDLImageResolution *)imageResolution { self = [self init]; if (!self) { return nil; } |