Add new example filters

Critter · Jun 19, 2011 · d829baf · d829baf
1 parent cf9eda3
commit d829baf
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 11 deletions.
diff --git a/Classes/ImageFilter.h b/Classes/ImageFilter.h
@@ -42,6 +42,7 @@ typedef NSUInteger CurveChannel;
 - (UIImage*) gaussianBlur:(NSUInteger)radius;
 - (UIImage*) vignette;
 - (UIImage*) darkVignette;
+- (UIImage*) polaroidish;
 
 /* Blend Operations */
 - (UIImage*) overlay:(UIImage*)other;

diff --git a/Classes/ImageFilter.m b/Classes/ImageFilter.m
@@ -809,8 +809,8 @@ - (UIImage*) vignette
 	UIImage *finalImage = [UIImage imageWithCGImage:imageRef];
 	CGImageRelease(imageRef);	
 
-	UIImage *mask = [finalImage gaussianBlur:5];
-	UIImage *blurredSelf = [self gaussianBlur:5];
+	UIImage *mask = [finalImage gaussianBlur:10];
+	UIImage *blurredSelf = [self gaussianBlur:2];
 	UIImage *maskedSelf = [self mask:mask];
 	return [blurredSelf merge:maskedSelf];
 }
@@ -868,4 +868,39 @@ - (UIImage*) darkVignette
 	return [self overlay:[maskedSquare opacity:1.0]];
 }
 
+// This filter is not done...
+- (UIImage*) polaroidish
+{
+	NSArray *redPoints = [NSArray arrayWithObjects:
+					   [NSValue valueWithCGPoint:CGPointMake(0, 0)],
+					   [NSValue valueWithCGPoint:CGPointMake(93, 81)],
+					   [NSValue valueWithCGPoint:CGPointMake(247, 241)],
+						  [NSValue valueWithCGPoint:CGPointMake(255, 255)],
+					   nil];
+	NSArray *bluePoints = [NSArray arrayWithObjects:
+						  [NSValue valueWithCGPoint:CGPointMake(0, 0)],
+						  [NSValue valueWithCGPoint:CGPointMake(57, 59)],
+						  [NSValue valueWithCGPoint:CGPointMake(223, 205)],
+						  [NSValue valueWithCGPoint:CGPointMake(255, 241)],
+						  nil];
+	UIImage *image = [[self applyCurve:redPoints toChannel:CurveChannelRed] 
+			  applyCurve:bluePoints toChannel:CurveChannelBlue];
+
+	redPoints = [NSArray arrayWithObjects:
+						  [NSValue valueWithCGPoint:CGPointMake(0, 0)],
+						  [NSValue valueWithCGPoint:CGPointMake(93, 76)],
+						  [NSValue valueWithCGPoint:CGPointMake(232, 226)],
+						  [NSValue valueWithCGPoint:CGPointMake(255, 255)],
+						  nil];
+	bluePoints = [NSArray arrayWithObjects:
+						   [NSValue valueWithCGPoint:CGPointMake(0, 0)],
+						   [NSValue valueWithCGPoint:CGPointMake(57, 59)],
+						   [NSValue valueWithCGPoint:CGPointMake(220, 202)],
+						   [NSValue valueWithCGPoint:CGPointMake(255, 255)],
+						   nil];
+	image = [[image applyCurve:redPoints toChannel:CurveChannelRed] 
+			 applyCurve:bluePoints toChannel:CurveChannelBlue];
+
+	return image;
+}
 @end
diff --git a/Classes/iphone_filtersViewController.h b/Classes/iphone_filtersViewController.h
@@ -14,7 +14,9 @@ typedef enum
 {
 	FilterPosterize = 0,
 	FilterSaturate,
+	FilterBrightness,
 	FilterContrast,
+	FilterGamma,
 	FilterTotal
 } FilterOptions;
 

diff --git a/Classes/iphone_filtersViewController.m b/Classes/iphone_filtersViewController.m
@@ -50,7 +50,9 @@ - (IBAction) buttonAdjustableClicked:(id)sender
 													   otherButtonTitles:
 									 NSLocalizedString(@"Posterize",@""), 
 									 NSLocalizedString(@"Saturate",@""),
+									 NSLocalizedString(@"Brightness",@""),
 									 NSLocalizedString(@"Contrast",@""),
+								     NSLocalizedString(@"Gamma",@""),
 									 nil];
 	self.actionSheetAdjustable.actionSheetStyle = UIActionSheetStyleDefault;
 	[self.actionSheetAdjustable showInView:self.view]; // show from our table view (pops up in the middle of the table)
@@ -59,15 +61,18 @@ - (IBAction) buttonAdjustableClicked:(id)sender
 - (IBAction) buttonPackagedClicked:(id)sender
 {
 	// open a dialog with two custom buttons
-	self.actionSheetPackaged = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Apply Filter",@"")
-																delegate:self 
-													   cancelButtonTitle:NSLocalizedString(@"Cancel",@"") 
-												  destructiveButtonTitle:NSLocalizedString(@"Reset",@"") 
-													   otherButtonTitles:
-									 NSLocalizedString(@"Sharpen",@""), 
-									 NSLocalizedString(@"Sepia",@""),
-									 NSLocalizedString(@"Lomo",@""),
-									 nil];
+	self.actionSheetPackaged = 
+		[[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Apply Filter",@"")
+									delegate:self 
+									cancelButtonTitle:NSLocalizedString(@"Cancel",@"") 
+									destructiveButtonTitle:NSLocalizedString(@"Reset",@"") 
+									otherButtonTitles:
+									NSLocalizedString(@"Sharpen",@""), 
+									NSLocalizedString(@"Sepia",@""),
+									NSLocalizedString(@"Lomo",@""),
+									NSLocalizedString(@"Vignette",@""),
+									NSLocalizedString(@"Polaroidish",@""),
+									nil];
 	self.actionSheetPackaged.actionSheetStyle = UIActionSheetStyleDefault;
 	[self.actionSheetPackaged showInView:self.view]; // show from our table view (pops up in the middle of the table)	
 
@@ -86,9 +91,15 @@ - (IBAction) sliderMoved:(id)sender
 		case FilterSaturate:
 			self.imageView.image = [image saturate:(1+value-0.5)];			
 			break;
+		case FilterBrightness:
+			self.imageView.image = [image brightness:(1+value-0.5)];			
+			break;
 		case FilterContrast:
 			self.imageView.image = [image contrast:(1+value-0.5)];			
 			break;
+		case FilterGamma:
+			self.imageView.image = [image gamma:(1+value-0.5)];			
+			break;
 		default:
 			break;
 	}
@@ -102,6 +113,8 @@ - (IBAction) sliderMoved:(id)sender
 	ActionSheetPackagedOptionSharpen,
 	ActionSheetPackagedOptionSepia,
 	ActionSheetPackagedOptionLomo,
+	ActionSheetPackagedOptionVignette,
+	ActionSheetPackagedOptionPolaroidish,
 	ActionSheetPackagedOptionTotal
 } ActionSheetPackagedOptions;
 
@@ -129,6 +142,12 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
 			case ActionSheetPackagedOptionLomo:
 				self.imageView.image = [image lomo];
 				break;
+			case ActionSheetPackagedOptionVignette:
+				self.imageView.image = [image vignette];
+				break;
+			case ActionSheetPackagedOptionPolaroidish:
+				self.imageView.image = [image polaroidish];
+				break;
 			default:
 				break;
 		}