diff --git a/iphone/.gitignore b/iphone/.gitignore index a606ca9..f4639ea 100644 --- a/iphone/.gitignore +++ b/iphone/.gitignore @@ -1,4 +1,3 @@ tmp bin -build -*.zip +build \ No newline at end of file diff --git a/iphone/Classes/ComBongoleTiGpuimageGPUImageView.m b/iphone/Classes/ComBongoleTiGpuimageGPUImageView.m index ecb547f..2cb0a11 100644 --- a/iphone/Classes/ComBongoleTiGpuimageGPUImageView.m +++ b/iphone/Classes/ComBongoleTiGpuimageGPUImageView.m @@ -10,17 +10,18 @@ #import "GPUImageSepiaFilter.h" #import "GPUImageMonochromeFilter.h" #import "GPUImageGrayscaleFilter.h" +#import "GPUImageFastBlurFilter.h" #import @implementation ComBongoleTiGpuimageGPUImageView -(void)setFilter_:(id)args { - ENSURE_TYPE_OR_NIL(args, NSString); - + // ENSURE_TYPE_OR_NIL(args, NSString); + ENSURE_SINGLE_ARG_OR_NIL(args, NSDictionary); //ENSURE_UI_THREAD_1_ARG(args); - NSString *filterType = args; + NSString *filterType = [args objectForKey:@"filtertype"]; UIImageView *imageview; object_getInstanceVariable(self, "imageView", (void *)&imageview); @@ -43,6 +44,10 @@ -(void)setFilter_:(id)args else if( [kGrayscaleFilter isEqualToString:filterType] ){ stillImageFilter = [[GPUImageGrayscaleFilter alloc] init]; } + else if( [kFastBlurFilter isEqualToString:filterType] ){ + stillImageFilter = [[GPUImageFastBlurFilter alloc] init]; + [stillImageFilter setBlurSize:[TiUtils floatValue:[args objectForKey:@"blursize"]]]; + } else{ [imageview setImage:original_image]; return; diff --git a/iphone/Classes/ComBongoleTiGpuimageModule.m b/iphone/Classes/ComBongoleTiGpuimageModule.m index f5b95a7..8017a7f 100644 --- a/iphone/Classes/ComBongoleTiGpuimageModule.m +++ b/iphone/Classes/ComBongoleTiGpuimageModule.m @@ -89,5 +89,6 @@ -(void)_listenerRemoved:(NSString *)type count:(int)count MAKE_SYSTEM_STR(SEPIA_FILTER, kSepiaFilter); MAKE_SYSTEM_STR(MONOCHROME_FILTER, kMonochromeFilter); MAKE_SYSTEM_STR(GRAYSCALE_FILTER, kGrayscaleFilter); +MAKE_SYSTEM_STR(FASTBLUR_FILTER, kFastBlurFilter); @end diff --git a/iphone/Classes/Constants.h b/iphone/Classes/Constants.h index e9c447d..c054048 100644 --- a/iphone/Classes/Constants.h +++ b/iphone/Classes/Constants.h @@ -1,3 +1,4 @@ extern NSString * const kSepiaFilter; extern NSString * const kMonochromeFilter; extern NSString * const kGrayscaleFilter; +extern NSString * const kFastBlurFilter; diff --git a/iphone/Classes/Constants.m b/iphone/Classes/Constants.m index fe73dc8..51c736b 100644 --- a/iphone/Classes/Constants.m +++ b/iphone/Classes/Constants.m @@ -1,3 +1,4 @@ NSString * const kSepiaFilter = @"sepia"; NSString * const kMonochromeFilter = @"monochrome"; NSString * const kGrayscaleFilter = @"grayscale"; +NSString * const kFastBlurFilter = @"fastblur"; diff --git a/iphone/dist/com.bongole.ti.gpuimage-iphone-0.2.zip b/iphone/dist/com.bongole.ti.gpuimage-iphone-0.2.zip new file mode 100644 index 0000000..61c9f02 Binary files /dev/null and b/iphone/dist/com.bongole.ti.gpuimage-iphone-0.2.zip differ diff --git a/iphone/manifest b/iphone/manifest index 0f2d46d..539533f 100644 --- a/iphone/manifest +++ b/iphone/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 0.1 +version: 0.2 apiversion: 2 description: My module author: Your Name @@ -15,4 +15,4 @@ name: TiGPUImageiPhone moduleid: com.bongole.ti.gpuimage guid: 43955728-0142-4b7b-ab87-e46883335d1a platform: iphone -minsdk: 3.0.2.GA +minsdk: 3.1.3.GA diff --git a/iphone/titanium.xcconfig b/iphone/titanium.xcconfig index 591ea32..f7fad17 100644 --- a/iphone/titanium.xcconfig +++ b/iphone/titanium.xcconfig @@ -4,13 +4,13 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 3.0.2.GA +TITANIUM_SDK_VERSION = 3.1.3.GA // // THESE SHOULD BE OK GENERALLY AS-IS // -TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) +TITANIUM_SDK = /Volumes/SSD/titaniumsdks/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include" TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore" HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)