README.mdown @@ -74,53 +74,6 @@ static CameraController *instance = nil; [button sendActionsForControlEvents:UIControlEventTouchUpInside]; } --(NSString *)stringPad:(int)numPad { - NSMutableString *pad = [NSMutableString stringWithCapacity:1024]; - for (int i=0; i<numPad; i++) { - [pad appendString:@" "]; - } - return pad; -} - --(void)inspectView: (UIView *)theView depth:(int)depth path:(NSString *)path { - - if (depth==0) { - NSLog(@"-------------------- <view hierarchy> -------------------"); - } - - NSString *pad = [self stringPad:depth]; - - // print some information about the current view - // - NSLog([NSString stringWithFormat:@"%@.description: %@",pad,[theView description]]); - if ([theView isKindOfClass:[UIImageView class]]) { - NSLog([NSString stringWithFormat:@"%@.class: UIImageView",pad]); - } else if ([theView isKindOfClass:[UILabel class]]) { - NSLog([NSString stringWithFormat:@"%@.class: UILabel",pad]); - NSLog([NSString stringWithFormat:@"%@.text: ",pad,[(UILabel *)theView text]]); - } else if ([theView isKindOfClass:[UIButton class]]) { - NSLog([NSString stringWithFormat:@"%@.class: UIButton",pad]); - NSLog([NSString stringWithFormat:@"%@.title: ",pad,[(UIButton *)theView titleForState:UIControlStateNormal]]); - } - NSLog([NSString stringWithFormat:@"%@.frame: %.0f, %.0f, %.0f, %.0f", pad, theView.frame.origin.x, theView.frame.origin.y, - theView.frame.size.width, theView.frame.size.height]); - NSLog([NSString stringWithFormat:@"%@.subviews: %d",pad, [theView.subviews count]]); - NSLog(@" "); - - // gotta love recursion: call this method for all subviews - // - for (int i=0; i<[theView.subviews count]; i++) { - NSString *subPath = [NSString stringWithFormat:@"%@/%d",path,i]; - NSLog([NSString stringWithFormat:@"%@--subview-- %@",pad,subPath]); - [self inspectView:[theView.subviews objectAtIndex:i] depth:depth+1 path:subPath]; - } - - if (depth==0) { - NSLog(@"-------------------- </view hierarchy> -------------------"); - } - -} - - (void)detectFaceThread { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -277,9 +230,7 @@ static CameraController *instance = nil; target:self selector:@selector(previewCheck) userInfo:nil repeats:YES]; - - //[self inspectView:self.view depth:0 path:@""]; - + if(self.sourceType == UIImagePickerControllerSourceTypeCamera) { [self setup]; } @@ -290,7 +241,6 @@ static CameraController *instance = nil; } - (void)cancelButtonAction:(id)sender { - if (isPreview) { isPreview = NO; [self performSelectorOnMainThread:@selector(reschedule) withObject:nil waitUntilDone:YES]; @@ -298,7 +248,6 @@ static CameraController *instance = nil; self.faceTimer = nil; [self dismissModalViewControllerAnimated:YES]; } - } - (void)viewDidDisappear:(BOOL)animated { Classes/CameraController.m @@ -1,6 +1,5 @@ // // UIImageOpenCV.h -// Whiteboard // // Created by Jeremy Collins on 3/2/09. // Copyright 2009 Jeremy Collins. All rights reserved. Classes/Utilities/UIImageOpenCV.h @@ -1,6 +1,5 @@ // // UIImageOpenCV.m -// Whiteboard // // Created by Jeremy Collins on 3/2/09. // Copyright 2009 Jeremy Collins. All rights reserved. Classes/Utilities/UIImageOpenCV.m @@ -1,6 +1,5 @@ // // UIImageResizing.h -// Whiteboard // // Created by Jeremy Collins on 2/24/09. // Copyright 2009 Jeremy Collins. All rights reserved. @@ -9,14 +8,7 @@ #import <Foundation/Foundation.h> @interface UIImage (Resize) -- (UIImage*)scaleToSize:(CGSize)size; - -- (UIImage *)scaleAndRotate:(CGRect)rect; - (UIImage *)scaleImage:(CGRect)rect; -- (UIImage*)imageByCropping:(CGRect)rect; - -- (UIImage *)grayscale; - @end \ No newline at end of file Classes/Utilities/UIImageResizing.h @@ -1,6 +1,5 @@ // // UIImageResizing.m -// Whiteboard // // Created by Jeremy Collins on 2/24/09. // Copyright 2009 Jeremy Collins. All rights reserved. @@ -10,126 +9,6 @@ @implementation UIImage (Resizing) -- (UIImage*)scaleToSize:(CGSize)size { - UIGraphicsBeginImageContext(size); - - CGContextRef context = UIGraphicsGetCurrentContext(); - CGContextTranslateCTM(context, 0.0, size.height); - CGContextScaleCTM(context, 1.0, -1.0); - - CGContextDrawImage(context, CGRectMake(0.0f, 0.0f, size.width, size.height), self.CGImage); - - UIImage *scaledImage = UIGraphicsGetImageFromCurrentImageContext(); - - UIGraphicsEndImageContext(); - - return scaledImage; -} - -- (UIImage *)scaleAndRotate:(CGRect)rect { - - CGImageRef imgRef = self.CGImage; - - CGFloat width = CGImageGetWidth(imgRef); - CGFloat height = CGImageGetHeight(imgRef); - - CGAffineTransform transform = CGAffineTransformIdentity; - CGRect bounds = CGRectMake(0, 0, width, height); - if (width > rect.size.width || height > rect.size.height) { - CGFloat ratio = width / height; - if (ratio > 1) { - bounds.size.width = rect.size.height; - bounds.size.height = bounds.size.width / ratio; - } else { - bounds.size.height = rect.size.width; - bounds.size.width = bounds.size.height * ratio; - } - } - - CGFloat scaleRatio = bounds.size.width / width; - CGSize imageSize = CGSizeMake(CGImageGetWidth(imgRef), CGImageGetHeight(imgRef)); - CGFloat boundHeight; - switch(self.imageOrientation) { - - case UIImageOrientationUp: //EXIF = 1 - transform = CGAffineTransformIdentity; - break; - - case UIImageOrientationUpMirrored: //EXIF = 2 - transform = CGAffineTransformMakeTranslation(imageSize.width, 0.0); - transform = CGAffineTransformScale(transform, -1.0, 1.0); - break; - - case UIImageOrientationDown: //EXIF = 3 - transform = CGAffineTransformMakeTranslation(imageSize.width, imageSize.height); - transform = CGAffineTransformRotate(transform, M_PI); - break; - - case UIImageOrientationDownMirrored: //EXIF = 4 - transform = CGAffineTransformMakeTranslation(0.0, imageSize.height); - transform = CGAffineTransformScale(transform, 1.0, -1.0); - break; - - case UIImageOrientationLeftMirrored: //EXIF = 5 - boundHeight = bounds.size.height; - bounds.size.height = bounds.size.width; - bounds.size.width = boundHeight; - transform = CGAffineTransformMakeTranslation(imageSize.height, imageSize.width); - transform = CGAffineTransformScale(transform, -1.0, 1.0); - transform = CGAffineTransformRotate(transform, 3.0 * M_PI / 2.0); - break; - - case UIImageOrientationLeft: //EXIF = 6 - boundHeight = bounds.size.height; - bounds.size.height = bounds.size.width; - bounds.size.width = boundHeight; - transform = CGAffineTransformMakeTranslation(0.0, imageSize.width); - transform = CGAffineTransformRotate(transform, 3.0 * M_PI / 2.0); - break; - - case UIImageOrientationRightMirrored: //EXIF = 7 - boundHeight = bounds.size.height; - bounds.size.height = bounds.size.width; - bounds.size.width = boundHeight; - transform = CGAffineTransformMakeScale(-1.0, 1.0); - transform = CGAffineTransformRotate(transform, M_PI / 2.0); - break; - - case UIImageOrientationRight: //EXIF = 8 - boundHeight = bounds.size.height; - bounds.size.height = bounds.size.width; - bounds.size.width = boundHeight; - transform = CGAffineTransformMakeTranslation(imageSize.height, 0.0); - transform = CGAffineTransformRotate(transform, M_PI / 2.0); - break; - - default: - [NSException raise:NSInternalInconsistencyException format:@"Invalid image orientation"]; - - } - - UIGraphicsBeginImageContext(bounds.size); - - CGContextRef context = UIGraphicsGetCurrentContext(); - - if (self.imageOrientation == UIImageOrientationRight || self.imageOrientation == UIImageOrientationLeft) { - CGContextScaleCTM(context, -scaleRatio, scaleRatio); - CGContextTranslateCTM(context, -height, 0); - } - else { - CGContextScaleCTM(context, scaleRatio, -scaleRatio); - CGContextTranslateCTM(context, 0, -height); - } - - CGContextConcatCTM(context, transform); - - CGContextDrawImage(context, CGRectMake(0, 0, width, height), imgRef); - UIImage *imageCopy = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - - return imageCopy; -} - - (UIImage *)scaleImage:(CGRect)rect { CGImageRef imgRef = self.CGImage; @@ -177,64 +56,4 @@ return imageCopy; } -- (UIImage*)imageByCropping:(CGRect)rect { - - //create a context to do our clipping in - UIGraphicsBeginImageContext(rect.size); - CGContextRef currentContext = UIGraphicsGetCurrentContext(); - - //create a rect with the size we want to crop the image to - //the X and Y here are zero so we start at the beginning of our - //newly created context - CGContextClipToRect(currentContext, rect); - - //create a rect equivalent to the full size of the image - //offset the rect by the X and Y we want to start the crop - //from in order to cut off anything before them - CGRect drawRect = CGRectMake(0, - 0, - self.size.width, - self.size.height + rect.origin.y); - - //draw the image to our clipped context using our offset rect - CGContextDrawImage(currentContext, rect, self.CGImage); - - //pull the image from our cropped context - UIImage *cropped = UIGraphicsGetImageFromCurrentImageContext(); - - //pop the context to get back to the default - UIGraphicsEndImageContext(); - - //Note: this is autoreleased - return cropped; -} - -- (UIImage *)grayscale { - - int w = self.size.width; - int h = self.size.height; - - CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceGray(); - - // Create a color bitmap context and write image into it. This enables - // access to the raw pixel data in RGBA format. - UInt8 *pixelData = (UInt8 *) malloc(w * h); - CGContextRef context = CGBitmapContextCreate(pixelData, - w, h, 8, w, - colorspace, - kCGImageAlphaNone); - CGContextDrawImage(context, CGRectMake(0, 0, w, h), self.CGImage); - - CGImageRef imageRef = CGBitmapContextCreateImage(context); - - CGContextRelease(context); - CGColorSpaceRelease(colorspace); - free(pixelData); - - UIImage *image = [UIImage imageWithCGImage:imageRef]; - CGImageRelease(imageRef); - - return image; -} - @end \ No newline at end of file Classes/Utilities/UIImageResizing.m @@ -2,14 +2,14 @@ { 1D3623240D0F684500981E51 /* TouchCameraAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {966, 753}}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 527}}"; sepNavSelRange = "{350, 0}"; sepNavVisRange = "{0, 496}"; }; }; 1D3623250D0F684500981E51 /* TouchCameraAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {926, 777}}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 527}}"; sepNavSelRange = "{543, 0}"; sepNavVisRange = "{0, 616}"; }; @@ -248,7 +248,7 @@ fRef = 8726C1AB0F746EB500E5D0F8 /* UIImageOpenCV.m */; name = "UIImageOpenCV.m: 41"; rLen = 0; - rLoc = 1248; + rLoc = 1233; rType = 0; vrLen = 2037; vrLoc = 0; @@ -258,7 +258,7 @@ fRef = 8726C1AD0F746EB500E5D0F8 /* UIImageResizing.m */; name = "UIImageResizing.m: 195"; rLen = 0; - rLoc = 6573; + rLoc = 1871; rType = 0; vrLen = 1597; vrLoc = 0; @@ -278,7 +278,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11044; + rLoc = 9166; rType = 0; vrLen = 1714; vrLoc = 9539; @@ -318,30 +318,37 @@ }; 8726C1A90F746EB500E5D0F8 /* UIImageAdditions.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {926, 550}}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 527}}"; sepNavSelRange = "{55, 0}"; sepNavVisRange = "{0, 55}"; }; }; 8726C1AA0F746EB500E5D0F8 /* UIImageOpenCV.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1010, 540}}"; - sepNavSelRange = "{323, 0}"; - sepNavVisRange = "{0, 336}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 527}}"; + sepNavSelRange = "{23, 0}"; + sepNavVisRange = "{0, 321}"; }; }; 8726C1AB0F746EB500E5D0F8 /* UIImageOpenCV.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {926, 3080}}"; - sepNavSelRange = "{1248, 0}"; - sepNavVisRange = "{0, 2037}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 3220}}"; + sepNavSelRange = "{23, 0}"; + sepNavVisRange = "{0, 1162}"; + }; + }; + 8726C1AC0F746EB500E5D0F8 /* UIImageResizing.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {926, 527}}"; + sepNavSelRange = "{232, 0}"; + sepNavVisRange = "{0, 237}"; }; }; 8726C1AD0F746EB500E5D0F8 /* UIImageResizing.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1193, 3388}}"; - sepNavSelRange = "{6502, 36}"; - sepNavVisRange = "{6246, 517}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 826}}"; + sepNavSelRange = "{1871, 0}"; + sepNavVisRange = "{0, 1228}"; }; }; 8726C2060F74729700E5D0F8 /* PBXTextBookmark */ = { @@ -349,7 +356,7 @@ fRef = 8726C1AA0F746EB500E5D0F8 /* UIImageOpenCV.h */; name = "UIImageOpenCV.h: 18"; rLen = 0; - rLoc = 323; + rLoc = 308; rType = 0; vrLen = 336; vrLoc = 0; @@ -359,7 +366,7 @@ fRef = 8726C1AB0F746EB500E5D0F8 /* UIImageOpenCV.m */; name = "UIImageOpenCV.m: 202"; rLen = 0; - rLoc = 7258; + rLoc = 7243; rType = 0; vrLen = 1360; vrLoc = 6097; @@ -369,7 +376,7 @@ fRef = 8726C1AA0F746EB500E5D0F8 /* UIImageOpenCV.h */; name = "UIImageOpenCV.h: 18"; rLen = 0; - rLoc = 323; + rLoc = 308; rType = 0; vrLen = 336; vrLoc = 0; @@ -379,7 +386,7 @@ fRef = 8726C1AD0F746EB500E5D0F8 /* UIImageResizing.m */; name = "UIImageResizing.m: 190"; rLen = 0; - rLoc = 6318; + rLoc = 1871; rType = 0; vrLen = 1409; vrLoc = 5907; @@ -445,7 +452,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1440; vrLoc = 14369; @@ -465,7 +472,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11044; + rLoc = 9166; rType = 0; vrLen = 2486; vrLoc = 8396; @@ -485,7 +492,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 397"; rLen = 0; - rLoc = 11521; + rLoc = 9633; rType = 0; vrLen = 1215; vrLoc = 13740; @@ -525,7 +532,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 387"; rLen = 63; - rLoc = 11284; + rLoc = 9401; rType = 0; vrLen = 1215; vrLoc = 13740; @@ -545,7 +552,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 396"; rLen = 0; - rLoc = 11501; + rLoc = 9613; rType = 0; vrLen = 1284; vrLoc = 13671; @@ -575,7 +582,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 396"; rLen = 0; - rLoc = 11501; + rLoc = 9613; rType = 0; vrLen = 1284; vrLoc = 13671; @@ -595,7 +602,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 248"; rLen = 0; - rLoc = 7423; + rLoc = 5599; rType = 0; vrLen = 2063; vrLoc = 7867; @@ -615,7 +622,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 397"; rLen = 0; - rLoc = 11523; + rLoc = 9635; rType = 0; vrLen = 1222; vrLoc = 13752; @@ -635,7 +642,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 335"; rLen = 0; - rLoc = 10078; + rLoc = 8254; rType = 0; vrLen = 1637; vrLoc = 825; @@ -665,7 +672,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 403"; rLen = 0; - rLoc = 11600; + rLoc = 9712; rType = 0; vrLen = 1222; vrLoc = 13756; @@ -705,7 +712,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1440; vrLoc = 14369; @@ -725,7 +732,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1236; vrLoc = 14302; @@ -769,7 +776,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1234; vrLoc = 14302; @@ -811,7 +818,7 @@ comments = "warning: incomplete implementation of class 'CameraController'"; fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; rLen = 1; - rLoc = 318; + rLoc = 267; rType = 1; }; 879B17860FB4DC2D00A98C7D /* PBXTextBookmark */ = { @@ -819,7 +826,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 414"; rLen = 5; - rLoc = 11626; + rLoc = 9738; rType = 0; vrLen = 158; vrLoc = 15366; @@ -849,7 +856,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 256"; rLen = 0; - rLoc = 10078; + rLoc = 8254; rType = 0; vrLen = 1992; vrLoc = 8881; @@ -869,7 +876,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1234; vrLoc = 14302; @@ -889,7 +896,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 246"; rLen = 0; - rLoc = 7265; + rLoc = 5441; rType = 0; vrLen = 1489; vrLoc = 5103; @@ -909,7 +916,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 254"; rLen = 19; - rLoc = 7401; + rLoc = 5577; rType = 0; vrLen = 1420; vrLoc = 8451; @@ -999,7 +1006,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 183"; rLen = 0; - rLoc = 6611; + rLoc = 4787; rType = 0; vrLen = 2487; vrLoc = 5091; @@ -1019,7 +1026,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 205"; rLen = 538; - rLoc = 7401; + rLoc = 5577; rType = 0; vrLen = 2097; vrLoc = 6493; @@ -1039,7 +1046,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 256"; rLen = 0; - rLoc = 10078; + rLoc = 8254; rType = 0; vrLen = 1992; vrLoc = 8881; @@ -1109,7 +1116,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11196; + rLoc = 9313; rType = 0; vrLen = 1555; vrLoc = 10076; @@ -1179,7 +1186,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11196; + rLoc = 9313; rType = 0; vrLen = 1555; vrLoc = 10076; @@ -1249,7 +1256,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11196; + rLoc = 9313; rType = 0; vrLen = 1791; vrLoc = 0; @@ -1259,7 +1266,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11196; + rLoc = 9313; rType = 0; vrLen = 1419; vrLoc = 0; @@ -1269,7 +1276,7 @@ fRef = 87BE9C5E0F6882AD0018340B /* CameraController.m */; name = "CameraController.m: 296"; rLen = 0; - rLoc = 11196; + rLoc = 9313; rType = 0; vrLen = 1419; vrLoc = 0; @@ -1330,8 +1337,8 @@ }; 87BE9C5D0F6882AD0018340B /* CameraController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {926, 800}}"; - sepNavSelRange = "{241, 23}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 546}}"; + sepNavSelRange = "{290, 0}"; sepNavVisRange = "{0, 738}"; }; }; PictureMe.xcodeproj/jcollins.pbxuser e0b5ae4791936512f76fd7ae67eb647d4be8e9a1 Jeremy Collins jcollins@carbon.home http://github.com/beetlebugorg/PictureMe/commit/f752dc510ff04bb161692ee695586ee9cb018f09 f752dc510ff04bb161692ee695586ee9cb018f09 2009-05-08T17:52:18-07:00 2009-05-08T17:52:18-07:00 Removed more unused code. Added README. d8b7845520fb674e03eed4a3adbed896d1b2db7e Jeremy Collins jcollins@carbon.home