This repository was archived by the owner on Aug 8, 2023. It is now read-only.
Commit b8be1f0 authored and committed Dec 16, 2015
1 parent af45d87 commit b8be1f0 Copy full SHA for b8be1f0
File tree 3 files changed +5
-8
lines changed
3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
13
13
* @param image The image to be displayed for the annotation.
14
14
* @param reuseIdentifier The string that identifies that this annotation image is reusable.
15
15
* @return The initialized annotation image object or `nil` if there was a problem initializing the object. */
16
- + (instancetype )annotationImageWithImage : (UIImage *)image reuseIdentifier : (nullable NSString *)reuseIdentifier ;
16
+ + (instancetype )annotationImageWithImage : (UIImage *)image reuseIdentifier : (NSString *)reuseIdentifier ;
17
17
18
18
/* * @name Getting and Setting Attributes */
19
19
Original file line number Diff line number Diff line change @@ -9,12 +9,12 @@ @interface MGLAnnotationImage ()
9
9
10
10
@implementation MGLAnnotationImage
11
11
12
- + (instancetype )annotationImageWithImage : (UIImage *)image reuseIdentifier : (nullable NSString *)reuseIdentifier
12
+ + (instancetype )annotationImageWithImage : (UIImage *)image reuseIdentifier : (NSString *)reuseIdentifier
13
13
{
14
14
return [[self alloc ] initWithImage: image reuseIdentifier: reuseIdentifier];
15
15
}
16
16
17
- - (instancetype )initWithImage : (UIImage *)image reuseIdentifier : (nullable NSString *)reuseIdentifier
17
+ - (instancetype )initWithImage : (UIImage *)image reuseIdentifier : (NSString *)reuseIdentifier
18
18
{
19
19
self = [super init ];
20
20
Original file line number Diff line number Diff line change @@ -187,12 +187,9 @@ void SpriteAtlas::updateDirty() {
187
187
// The two names match;
188
188
Holder& holder = imageIterator->second ;
189
189
holder.texture = spriteIterator->second ;
190
- if (holder.texture != nullptr )
191
- {
190
+ if (holder.texture != nullptr ) {
192
191
copy (holder, imageIterator->first .second );
193
- }
194
- else
195
- {
192
+ } else {
196
193
images.erase (imageIterator);
197
194
}
198
195
You can’t perform that action at this time.
0 commit comments