equal
deleted
inserted
replaced
21 |
21 |
22 #import <Foundation/Foundation.h> |
22 #import <Foundation/Foundation.h> |
23 |
23 |
24 |
24 |
25 @interface UIImage (extra) |
25 @interface UIImage (extra) |
26 |
26 |
|
27 CGFloat getScreenScale(void); |
|
28 |
27 -(UIImage *)scaleToSize:(CGSize) size; |
29 -(UIImage *)scaleToSize:(CGSize) size; |
28 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint; |
30 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint; |
29 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint ofSize:(CGSize) resultingSize; |
31 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint ofSize:(CGSize) resultingSize; |
30 -(id) initWithContentsOfFile:(NSString *)path andCutAt:(CGRect) rect; |
32 -(id) initWithContentsOfFile:(NSString *)path andCutAt:(CGRect) rect; |
31 -(UIImage *)cutAt:(CGRect) rect; |
33 -(UIImage *)cutAt:(CGRect) rect; |