equal
deleted
inserted
replaced
11 |
11 |
12 @interface UIImage (extra) |
12 @interface UIImage (extra) |
13 |
13 |
14 -(UIImage *)scaleToSize:(CGSize) size; |
14 -(UIImage *)scaleToSize:(CGSize) size; |
15 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint; |
15 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint; |
|
16 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint atSize:(CGSize) resultingSize; |
16 -(id) initWithContentsOfFile:(NSString *)path andCutAt:(CGRect) rect; |
17 -(id) initWithContentsOfFile:(NSString *)path andCutAt:(CGRect) rect; |
17 |
18 |
18 @end |
19 @end |