equal
deleted
inserted
replaced
52 // Return our new scaled image (autoreleased) |
52 // Return our new scaled image (autoreleased) |
53 return scaledImage; |
53 return scaledImage; |
54 } |
54 } |
55 |
55 |
56 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint { |
56 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint { |
57 // create a contex of size of the background image |
|
58 return [self mergeWith:secondImage atPoint:secondImagePoint ofSize:self.size]; |
|
59 } |
|
60 |
|
61 -(UIImage *)mergeWith:(UIImage *)secondImage atPoint:(CGPoint) secondImagePoint ofSize:(CGSize) resultingSize { |
|
62 if (secondImage == nil) { |
57 if (secondImage == nil) { |
63 DLog(@"Warning, secondImage == nil"); |
58 DLog(@"Warning, secondImage == nil"); |
64 return self; |
59 return self; |
65 } |
60 } |
66 CGFloat screenScale = getScreenScale(); |
61 CGFloat screenScale = getScreenScale(); |
67 int w = resultingSize.width * screenScale; |
62 int w = self.size.width * screenScale; |
68 int h = resultingSize.height * screenScale; |
63 int h = self.size.height * screenScale; |
69 |
64 |
70 if (w == 0 || h == 0) { |
65 if (w == 0 || h == 0) { |
71 DLog(@"Can have 0 dimesions"); |
66 DLog(@"Can have 0 dimesions"); |
72 return self; |
67 return self; |
73 } |
68 } |
253 } |
248 } |
254 |
249 |
255 +(UIImage *)whiteImage:(CGSize) ofSize { |
250 +(UIImage *)whiteImage:(CGSize) ofSize { |
256 CGFloat w = ofSize.width; |
251 CGFloat w = ofSize.width; |
257 CGFloat h = ofSize.height; |
252 CGFloat h = ofSize.height; |
|
253 DLog(@"w: %f, h: %f", w, h); |
258 |
254 |
259 CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); |
255 CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); |
260 CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst); |
256 CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst); |
261 |
257 |
262 CGContextBeginPath(context); |
258 CGContextBeginPath(context); |