mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
Fix error in last change
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25180 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d1ca91a7fa
commit
581bae3a8d
2 changed files with 6 additions and 10 deletions
|
@ -1,3 +1,7 @@
|
|||
2007-05-17 Riccardo Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSFont.m: Revert incorrect matrix equality test change.
|
||||
|
||||
2007-05-16 Riccardo Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/AppKit/NSFontDescriptor.h: tidied indentation etc.
|
||||
|
|
|
@ -857,22 +857,14 @@ static void setNSFont(NSString *key, NSFont *font)
|
|||
|
||||
- (BOOL) isEqual: (id)anObject
|
||||
{
|
||||
NSAffineTransformStruct ats;
|
||||
|
||||
if (anObject == self)
|
||||
return YES;
|
||||
if ([anObject isKindOfClass: self->isa] == NO)
|
||||
return NO;
|
||||
if ([[anObject fontName] isEqual: fontName] == NO)
|
||||
return NO;
|
||||
ats = [[(NSFontDescriptor*)anObject matrix] transformStruct];
|
||||
if (ats.m11 != matrix[0]) return NO;
|
||||
if (ats.m12 != matrix[1]) return NO;
|
||||
if (ats.m21 != matrix[2]) return NO;
|
||||
if (ats.m22 != matrix[3]) return NO;
|
||||
if (ats.tX != matrix[4]) return NO;
|
||||
if (ats.tY != matrix[5]) return NO;
|
||||
|
||||
if (memcmp(matrix, [(NSFont*)anObject matrix], sizeof(matrix)) != 0)
|
||||
return NO;
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue