Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

fix blur size property removed from gpuimage. #51

Merged
merged 2 commits into from

2 participants

@nebiros

gpuimage has removed blurSize property, I just change it to the new one
in order to work with the last stable gpuimage release, 0.1.2. See the
issue reported here: #45.

nebiros added some commits
@nebiros nebiros GPUImage up to 0.1.2. 098806d
@nebiros nebiros fix blur size property removed from gpuimage.
gpuimage has removed blurSize property, I just change it to the new one
in order to work with the last stable gpuimage release, 0.1.2. See the
issue reported here:
gobackspaces#45.
08ad0e1
@dmitric dmitric merged commit e8ecbb1 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 19, 2013
  1. @nebiros

    GPUImage up to 0.1.2.

    nebiros authored
  2. @nebiros

    fix blur size property removed from gpuimage.

    nebiros authored
    gpuimage has removed blurSize property, I just change it to the new one
    in order to work with the last stable gpuimage release, 0.1.2. See the
    issue reported here:
    gobackspaces#45.
This page is out of date. Refresh to see the latest.
Showing with 8 additions and 8 deletions.
  1. +7 −7 Classes/DLCImagePickerController.m
  2. +1 −1  GPUImage
View
14 Classes/DLCImagePickerController.m
@@ -353,7 +353,7 @@ -(IBAction) toggleBlur:(UIButton*)blurButton {
blurFilter = [[GPUImageGaussianSelectiveBlurFilter alloc] init];
[(GPUImageGaussianSelectiveBlurFilter*)blurFilter setExcludeCircleRadius:80.0/320.0];
[(GPUImageGaussianSelectiveBlurFilter*)blurFilter setExcludeCirclePoint:CGPointMake(0.5f, 0.5f)];
- [(GPUImageGaussianSelectiveBlurFilter*)blurFilter setBlurSize:kStaticBlurSize];
+ [(GPUImageGaussianSelectiveBlurFilter*)blurFilter setBlurRadiusInPixels:kStaticBlurSize];
[(GPUImageGaussianSelectiveBlurFilter*)blurFilter setAspectRatio:1.0f];
}
hasBlur = YES;
@@ -518,20 +518,20 @@ -(IBAction) handlePan:(UIGestureRecognizer *) sender {
if ([sender state] == UIGestureRecognizerStateBegan) {
[self showBlurOverlay:YES];
- [gpu setBlurSize:0.0f];
+ [gpu setBlurRadiusInPixels:0.0f];
if (isStatic) {
[staticPicture processImage];
}
}
if ([sender state] == UIGestureRecognizerStateBegan || [sender state] == UIGestureRecognizerStateChanged) {
- [gpu setBlurSize:0.0f];
+ [gpu setBlurRadiusInPixels:0.0f];
[self.blurOverlayView setCircleCenter:tapPoint];
[gpu setExcludeCirclePoint:CGPointMake(tapPoint.x/320.0f, tapPoint.y/320.0f)];
}
if([sender state] == UIGestureRecognizerStateEnded){
- [gpu setBlurSize:kStaticBlurSize];
+ [gpu setBlurRadiusInPixels:kStaticBlurSize];
[self showBlurOverlay:NO];
if (isStatic) {
[staticPicture processImage];
@@ -585,14 +585,14 @@ -(IBAction) handlePinch:(UIPinchGestureRecognizer *) sender {
if ([sender state] == UIGestureRecognizerStateBegan) {
[self showBlurOverlay:YES];
- [gpu setBlurSize:0.0f];
+ [gpu setBlurRadiusInPixels:0.0f];
if (isStatic) {
[staticPicture processImage];
}
}
if ([sender state] == UIGestureRecognizerStateBegan || [sender state] == UIGestureRecognizerStateChanged) {
- [gpu setBlurSize:0.0f];
+ [gpu setBlurRadiusInPixels:0.0f];
[gpu setExcludeCirclePoint:CGPointMake(midpoint.x/320.0f, midpoint.y/320.0f)];
self.blurOverlayView.circleCenter = CGPointMake(midpoint.x, midpoint.y);
CGFloat radius = MAX(MIN(sender.scale*[gpu excludeCircleRadius], 0.6f), 0.15f);
@@ -602,7 +602,7 @@ -(IBAction) handlePinch:(UIPinchGestureRecognizer *) sender {
}
if ([sender state] == UIGestureRecognizerStateEnded) {
- [gpu setBlurSize:kStaticBlurSize];
+ [gpu setBlurRadiusInPixels:kStaticBlurSize];
[self showBlurOverlay:NO];
if (isStatic) {
[staticPicture processImage];
2  GPUImage
@@ -1 +1 @@
-Subproject commit a29f15a72528e152892f6245abb2f37271fa5a70
+Subproject commit 49fcf22d00910f5439392881839cf1d6fed729c1
Something went wrong with that request. Please try again.