Changeset 5375

Timestamp:

03/13/08 18:22:29 (7 months ago)

Author:

morris

Message:

Add -imageBySuperimposingImage:

Files:

• WiredAdditions/trunk/NSImage-WIAdditions.h (modified) (1 diff)
• WiredAdditions/trunk/NSImage-WIAdditions.m (modified) (1 diff)

WiredAdditions/trunk/NSImage-WIAdditions.h

@@ -36 +36 @@
-- (NSImage *)mirroredImage;
-- (NSImage *)scaledImageWithSize:(NSSize)size;
+- (NSImage *)imageBySuperimposingImage:(NSImage *)image;
-
-- (NSImage *)imageWithAffineTransform:(NSAffineTransform *)transform action:(SEL)action;

WiredAdditions/trunk/NSImage-WIAdditions.m

@@ -212 +212 @@
-
-
+- (NSImage *)imageBySuperimposingImage:(NSImage *)image {
+        NSImage                 *newImage;
+        NSSize                  size;
+
+        size = [self size];
+        [image setSize:size];
+        
+        newImage = [[NSImage alloc] initWithSize:size];
+        [newImage lockFocus];
+
+        [self drawAtPoint:NSZeroPoint
+                         fromRect:NSMakeRect(0.0, 0.0, size.width, size.height)
+                        operation:NSCompositeSourceOver
+                         fraction:1.0];
+
+        [image drawAtPoint:NSZeroPoint
+                         fromRect:NSMakeRect(0.0, 0.0, size.width, size.height)
+                        operation:NSCompositeSourceOver
+                         fraction:1.0];
+
+        [newImage unlockFocus];
+
+        return [newImage autorelease];
+}
+
+
+
-#pragma mark -
-