From c8690dd5d735d22f1a0a48ac2af08517b26143fd Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Mon, 12 Oct 2009 15:05:47 +0000 Subject: [PATCH] improve isEqual: for named colors git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28809 72102866-910b-0410-8b05-ffd578937521 --- Source/NSColor.m | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Source/NSColor.m b/Source/NSColor.m index da6ffef4f..a5672418d 100644 --- a/Source/NSColor.m +++ b/Source/NSColor.m @@ -1893,15 +1893,12 @@ static NSRecursiveLock *namedColorLock = nil; - (BOOL) isEqual: (id)other { + /* Instances of this class are uniqued, so a test for pointer equality + * is sufficient. + */ if (other == self) return YES; - if ([other isKindOfClass: [self class]] == NO - || [[other catalogNameComponent] isEqualToString: _catalog_name] == NO - || [[other colorNameComponent] isEqualToString: _color_name] == NO) - { - return NO; - } - return YES; + return NO; } - (NSColor*) colorUsingColorSpaceName: (NSString *)colorSpace