processImage should be moved to last step

eklipse2k8 · Jul 22, 2012 · fa6c310 · fa6c310
1 parent 9f85fcb
commit fa6c310
Showing 1 changed file with 5 additions and 46 deletions.
diff --git a/FilterKit/FilterKit/FKGPUFilterGroup.m b/FilterKit/FilterKit/FKGPUFilterGroup.m
@@ -12,11 +12,11 @@
 #import "GPUImagePicture.h"
 #import "GPUImageView.h"
 #import "GPUImageRawDataOutput.h"
+#import "GPUImageUIElement.h"
 
 @implementation FKGPUFilterGroup {
     @private
     NSMutableArray *_gpuFilters;
-    GPUImagePicture *_picture;
 }
 
 - (id)init
@@ -42,11 +42,10 @@ - (void)addGPUFilter:(GPUImageFilter *)filter
 
 - (UIImage *)imageWithFilterAppliedWithImage:(UIImage *)image
 {
-    _picture = [[GPUImagePicture alloc] initWithImage:image smoothlyScaleOutput:YES];
+    GPUImagePicture *picture = [[GPUImagePicture alloc] initWithImage:image smoothlyScaleOutput:YES];
-    [_picture processImage];
+    GPUImageOutput *lastFilter = picture;
-
-    GPUImageOutput *lastFilter = _picture;
     GPUImageFilter *filter = nil;
+
     NSUInteger count = [_gpuFilters count];
     for (NSUInteger i = 0; i < count; i++) {
         filter = [_gpuFilters objectAtIndex:i];
@@ -55,48 +54,8 @@ - (UIImage *)imageWithFilterAppliedWithImage:(UIImage *)image
         [lastFilter addTarget:filter];
         lastFilter = filter;
     }
+    [picture processImage];
     return lastFilter.imageFromCurrentlyProcessedOutput;
 }
 
-
-//- (UIImage *)imageWithFilterAppliedWithImage:(UIImage *)image
-//{
-//    GPUImageView *view = [[GPUImageView alloc] initWithFrame:CGRectMake(0, 0, image.size.width, image.size.height)];
-//    
-// //   GPUImageRawDataOutput *raw = [[GPUImageRawDataOutput alloc] initWithImageSize:image.size resultsInBGRAFormat:YES];
-//    
-//    _picture = [[GPUImagePicture alloc] initWithImage:image smoothlyScaleOutput:YES];
-//    GPUImageOutput *lastFilter = view;
-//    GPUImageFilter *filter = nil;
-//    NSUInteger count = [_gpuFilters count];
-//    for (NSUInteger i = 0; i < count; i++) {
-//        filter = [_gpuFilters objectAtIndex:i];
-//        
-//        //[lastFilter removeAllTargets];
-//        [filter addTarget:lastFilter];
-//        //[lastFilter addTarget:filter];
-//        lastFilter = filter;
-//    }
-//    
-//    [_picture addTarget:lastFilter];
-//
-//    if ([lastFilter respondsToSelector:@selector(processImage)]) {
-//        [(GPUImagePicture *)lastFilter processImage];
-//    }
-//
-// //   [lastFilter addTarget:raw];
-//    
-//   // NSData *bytes = [NSData dataWithBytes:[raw rawBytesForImage] length:(image.size.width * image.size.height * 4 * sizeof(GLubyte))];
-//    //UIImage *imageFromBytes = [UIImage imageWithData:bytes];
-//    //return filter.imageFromCurrentlyProcessedOutput;
-//    
-//    UIImage *result;
-//    UIGraphicsBeginImageContextWithOptions(image.size, NO, [UIScreen mainScreen].scale);
-//    [view.layer renderInContext:UIGraphicsGetCurrentContext()];
-//    result = UIGraphicsGetImageFromCurrentImageContext();
-//    UIGraphicsEndImageContext();
-//    
-//    return result;
-//}
-
 @end