Fix warnings about implicity retaining self in block.

yackle · Jul 4, 2018 · 93b25db · 93b25db
1 parent efc7a7e
commit 93b25db
Show file tree

Hide file tree

Showing 22 changed files with 131 additions and 131 deletions.
diff --git a/CLImageEditor/ImageTools/CLAdjustmentTool/CLAdjustmentTool.m b/CLImageEditor/ImageTools/CLAdjustmentTool/CLAdjustmentTool.m
@@ -56,18 +56,18 @@ - (void)cleanup
 - (void)executeWithCompletionBlock:(void(^)(UIImage *image, NSError *error, NSDictionary *userInfo))completionBlock
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        _indicatorView = [CLImageEditorTheme indicatorView];
-        _indicatorView.center = self.editor.view.center;
-        [self.editor.view addSubview:_indicatorView];
-        [_indicatorView startAnimating];
+        self->_indicatorView = [CLImageEditorTheme indicatorView];
+        self->_indicatorView.center = self.editor.view.center;
+        [self.editor.view addSubview:self->_indicatorView];
+        [self->_indicatorView startAnimating];
     });
 
     CGFloat saturation = _saturationSlider.value;
     CGFloat brightness = _brightnessSlider.value;
     CGFloat contrast   = _contrastSlider.value;
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [self filteredImage:_originalImage saturation:saturation brightness:brightness contrast:contrast];
+        UIImage *image = [self filteredImage:self->_originalImage saturation:saturation brightness:brightness contrast:contrast];
 
         dispatch_async(dispatch_get_main_queue(), ^{
             completionBlock(image, nil, nil);
@@ -145,7 +145,7 @@ - (void)sliderDidChange:(UISlider*)sender
     CGFloat contrast   = _contrastSlider.value;
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [self filteredImage:_thumbnailImage saturation:saturation brightness:brightness contrast:contrast];
+        UIImage *image = [self filteredImage:self->_thumbnailImage saturation:saturation brightness:brightness contrast:contrast];
         [self.editor.imageView performSelectorOnMainThread:@selector(setImage:) withObject:image waitUntilDone:NO];
         inProgress = NO;
     });

diff --git a/CLImageEditor/ImageTools/CLBlurTool/CLBlurTool.m b/CLImageEditor/ImageTools/CLBlurTool/CLBlurTool.m
@@ -104,7 +104,7 @@ - (void)setup
     _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformIdentity;
+                         self->_menuScroll.transform = CGAffineTransformIdentity;
                      }];
 
     [self setDefaultParams];
@@ -119,25 +119,25 @@ - (void)cleanup
 
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
+                         self->_menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-self->_menuScroll.top);
                      }
                      completion:^(BOOL finished) {
-                         [_menuScroll removeFromSuperview];
+                         [self->_menuScroll removeFromSuperview];
                      }];
 }
 
 - (void)executeWithCompletionBlock:(void(^)(UIImage *image, NSError *error, NSDictionary *userInfo))completionBlock
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         UIActivityIndicatorView *indicator = [CLImageEditorTheme indicatorView];
-        indicator.center = CGPointMake(_handlerView.width/2, _handlerView.height/2);
-        [_handlerView addSubview:indicator];
+        indicator.center = CGPointMake(self->_handlerView.width/2, self->_handlerView.height/2);
+        [self->_handlerView addSubview:indicator];
         [indicator startAnimating];
     });
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *blurImage = [_originalImage gaussBlur:[self getBlurValue]];
-        UIImage *image = [self buildResultImage:_originalImage withBlurImage:blurImage];
+        UIImage *blurImage = [self->_originalImage gaussBlur:[self getBlurValue]];
+        UIImage *image = [self buildResultImage:self->_originalImage withBlurImage:blurImage];
 
         dispatch_async(dispatch_get_main_queue(), ^{
             completionBlock(image, nil, nil);
@@ -150,7 +150,7 @@ - (CGFloat)getBlurValue
     __block CGFloat value = 0;
 
     safe_dispatch_sync_main(^{
-        value = _blurSlider.value;
+        value = self->_blurSlider.value;
     });
     return value;
 }
@@ -264,7 +264,7 @@ - (UISlider*)sliderWithValue:(CGFloat)value minimumValue:(CGFloat)min maximumVal
 - (void)sliderDidChange:(UISlider*)slider
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        _blurImage = [_thumbnailImage gaussBlur:[self getBlurValue]];
+        self->_blurImage = [self->_thumbnailImage gaussBlur:[self getBlurValue]];
         [self buildThumbnailImage];
     });
 }
@@ -278,7 +278,7 @@ - (void)buildThumbnailImage
     inProgress = YES;
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [self buildResultImage:_thumbnailImage withBlurImage:_blurImage];
+        UIImage *image = [self buildResultImage:self->_thumbnailImage withBlurImage:self->_blurImage];
 
         [self.editor.imageView performSelectorOnMainThread:@selector(setImage:) withObject:image waitUntilDone:NO];
         inProgress = NO;
@@ -324,7 +324,7 @@ - (UIImage*)circleBlurImage:(UIImage*)image withBlurImage:(UIImage*)blurImage
 
     safe_dispatch_sync_main(^{
         ratio = image.size.width / self.editor.imageView.width;
-        frame  = _circleView.frame;
+        frame  = self->_circleView.frame;
     });
 
     frame.size.width  *= ratio;
@@ -350,7 +350,7 @@ - (UIImage*)bandBlurImage:(UIImage*)image withBlurImage:(UIImage*)blurImage
     __block CGFloat offset = 0;
 
     safe_dispatch_sync_main(^{
-        offset = _bandView.offset*image.size.width/_handlerView.width;
+        offset = self->_bandView.offset*image.size.width/self->_handlerView.width;
     });
 
     UIImage *mask = [CLImageEditorTheme imageNamed:[self class] image:@"band.png"];

diff --git a/CLImageEditor/ImageTools/CLClippingTool/CLClippingTool.m b/CLImageEditor/ImageTools/CLClippingTool/CLClippingTool.m
@@ -142,7 +142,7 @@ - (void)setup
     _menuContainer.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuContainer.transform = CGAffineTransformIdentity;
+                         self->_menuContainer.transform = CGAffineTransformIdentity;
                      }];
 }
 
@@ -153,10 +153,10 @@ - (void)cleanup
 
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuContainer.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
+                         self->_menuContainer.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-self->_menuScroll.top);
                      }
                      completion:^(BOOL finished) {
-                         [_menuContainer removeFromSuperview];
+                         [self->_menuContainer removeFromSuperview];
                      }];
 }
 
@@ -436,10 +436,10 @@ - (void)setClippingRect:(CGRect)clippingRect animated:(BOOL)animated
     if(animated){
         [UIView animateWithDuration:kCLImageToolFadeoutDuration
                          animations:^{
-                             _ltView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x, clippingRect.origin.y) fromView:self];
-                             _lbView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x, clippingRect.origin.y+clippingRect.size.height) fromView:self];
-                             _rtView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x+clippingRect.size.width, clippingRect.origin.y) fromView:self];
-                             _rbView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x+clippingRect.size.width, clippingRect.origin.y+clippingRect.size.height) fromView:self];
+                             self->_ltView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x, clippingRect.origin.y) fromView:self];
+                             self->_lbView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x, clippingRect.origin.y+clippingRect.size.height) fromView:self];
+                             self->_rtView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x+clippingRect.size.width, clippingRect.origin.y) fromView:self];
+                             self->_rbView.center = [self.superview convertPoint:CGPointMake(clippingRect.origin.x+clippingRect.size.width, clippingRect.origin.y+clippingRect.size.height) fromView:self];
                          }
          ];
 
@@ -735,4 +735,4 @@ - (void)changeOrientation
      ];
 }
 
-@end
+@end
diff --git a/CLImageEditor/ImageTools/CLDrawTool/CLDrawTool.m b/CLImageEditor/ImageTools/CLDrawTool/CLDrawTool.m
@@ -83,7 +83,7 @@ - (void)setup
     _menuView.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuView.top);
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuView.transform = CGAffineTransformIdentity;
+                         self->_menuView.transform = CGAffineTransformIdentity;
                      }];
 
 }
@@ -96,10 +96,10 @@ - (void)cleanup
 
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuView.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuView.top);
+                         self->_menuView.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-self->_menuView.top);
                      }
                      completion:^(BOOL finished) {
-                         [_menuView removeFromSuperview];
+                         [self->_menuView removeFromSuperview];
                      }];
 }
 

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLBloomEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLBloomEffect.m
@@ -80,7 +80,7 @@ - (CGFloat)getRadius
     __block CGFloat value = 0;
 
     safe_dispatch_sync_main(^{
-        value = _radiusSlider.value;
+        value = self->_radiusSlider.value;
     });
     return value;
 }
@@ -90,7 +90,7 @@ - (NSNumber*)getIntensityValue
     __block NSNumber *value = nil;
 
     safe_dispatch_sync_main(^{
-        value = [NSNumber numberWithFloat:_intensitySlider.value];
+        value = [NSNumber numberWithFloat:self->_intensitySlider.value];
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLGloomEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLGloomEffect.m
@@ -80,7 +80,7 @@ - (CGFloat)getRadius
     __block CGFloat value = 0;
 
     safe_dispatch_sync_main(^{
-        value = _radiusSlider.value;
+        value = self->_radiusSlider.value;
     });
     return value;
 }
@@ -90,7 +90,7 @@ - (NSNumber*)getIntensityValue
     __block NSNumber *value = nil;
 
     safe_dispatch_sync_main(^{
-        value = [NSNumber numberWithFloat:_intensitySlider.value];
+        value = [NSNumber numberWithFloat:self->_intensitySlider.value];
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLHighlightShadowEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLHighlightShadowEffect.m
@@ -76,7 +76,7 @@ - (NSNumber*)getShadowValue
     __block NSNumber *value = nil;
 
     safe_dispatch_sync_main(^{
-        value = [NSNumber numberWithFloat:_shadowSlider.value];
+        value = [NSNumber numberWithFloat:self->_shadowSlider.value];
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLHueEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLHueEffect.m
@@ -71,7 +71,7 @@ - (NSNumber*)getHueValue
     __block NSNumber *value = nil;
 
     safe_dispatch_sync_main(^{
-        value = [NSNumber numberWithFloat:_hueSlider.value];
+        value = [NSNumber numberWithFloat:self->_hueSlider.value];
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLPixellateEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLPixellateEffect.m
@@ -76,7 +76,7 @@ - (CGFloat)getRadius
     __block CGFloat value = 0;
 
     safe_dispatch_sync_main(^{
-        value = _radiusSlider.value;
+        value = self->_radiusSlider.value;
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLPosterizeEffect.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffect/CLPosterizeEffect.m
@@ -70,7 +70,7 @@ - (NSNumber*)getLevelValue
     __block NSNumber *value = nil;
 
     safe_dispatch_sync_main(^{
-        value = [NSNumber numberWithFloat:-_levelSlider.value];
+        value = [NSNumber numberWithFloat:-self->_levelSlider.value];
     });
     return value;
 }

diff --git a/CLImageEditor/ImageTools/CLEffectTool/CLEffectTool.m b/CLImageEditor/ImageTools/CLEffectTool/CLEffectTool.m
@@ -57,7 +57,7 @@ - (void)setup
     _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformIdentity;
+                         self->_menuScroll.transform = CGAffineTransformIdentity;
                      }];
 }
 
@@ -70,24 +70,24 @@ - (void)cleanup
 
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
+                         self->_menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-self->_menuScroll.top);
                      }
                      completion:^(BOOL finished) {
-                         [_menuScroll removeFromSuperview];
+                         [self->_menuScroll removeFromSuperview];
                      }];
 }
 
 - (void)executeWithCompletionBlock:(void(^)(UIImage *image, NSError *error, NSDictionary *userInfo))completionBlock
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        _indicatorView = [CLImageEditorTheme indicatorView];
-        _indicatorView.center = self.editor.view.center;
-        [self.editor.view addSubview:_indicatorView];
-        [_indicatorView startAnimating];
+        self->_indicatorView = [CLImageEditorTheme indicatorView];
+        self->_indicatorView.center = self.editor.view.center;
+        [self.editor.view addSubview:self->_indicatorView];
+        [self->_indicatorView startAnimating];
     });
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [self.selectedEffect applyEffect:_originalImage];
+        UIImage *image = [self.selectedEffect applyEffect:self->_originalImage];
 
         dispatch_async(dispatch_get_main_queue(), ^{
             completionBlock(image, nil, nil);

diff --git a/CLImageEditor/ImageTools/CLFilterTool/CLFilterTool.m b/CLImageEditor/ImageTools/CLFilterTool/CLFilterTool.m
@@ -46,18 +46,18 @@ - (void)setup
     _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformIdentity;
+                         self->_menuScroll.transform = CGAffineTransformIdentity;
                      }];
 }
 
 - (void)cleanup
 {
     [UIView animateWithDuration:kCLImageToolAnimationDuration
                      animations:^{
-                         _menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-_menuScroll.top);
+                         self->_menuScroll.transform = CGAffineTransformMakeTranslation(0, self.editor.view.height-self->_menuScroll.top);
                      }
                      completion:^(BOOL finished) {
-                         [_menuScroll removeFromSuperview];
+                         [self->_menuScroll removeFromSuperview];
                      }];
 }
 
@@ -111,7 +111,7 @@ - (void)tappedFilterPanel:(UITapGestureRecognizer*)sender
      ];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [self filteredImage:_originalImage withToolInfo:view.toolInfo];
+        UIImage *image = [self filteredImage:self->_originalImage withToolInfo:view.toolInfo];
         [self.editor.imageView performSelectorOnMainThread:@selector(setImage:) withObject:image waitUntilDone:NO];
         inProgress = NO;
     });