diff -r 717b4e46e855 -r cfc6cd502f85 cocoaTouch/otherSrc/UIImageExtra.h --- a/cocoaTouch/otherSrc/UIImageExtra.h Mon Apr 19 15:30:11 2010 +0000 +++ b/cocoaTouch/otherSrc/UIImageExtra.h Wed Apr 21 01:57:23 2010 +0000 @@ -13,6 +13,7 @@ -(UIImage *)scaleToSize:(CGSize) size; -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint; +-(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint atSize:(CGSize) resultingSize; -(id) initWithContentsOfFile:(NSString *)path andCutAt:(CGRect) rect; @end