gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 21:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix error in last change

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25180 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-05-17 05:26:09 +00:00
parent f09d5fbf26
commit cc9d14d94e
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2007-05-16 Riccardo Frith-Macdonald <rfm@gnu.org>
* Headers/AppKit/NSFontDescriptor.h: tidied indentation etc. * Headers/AppKit/NSFontDescriptor.h: tidied indentation etc.

12
Source/NSFont.m
View file

@ -857,22 +857,14 @@ static void setNSFont(NSString *key, NSFont *font)
- (BOOL) isEqual: (id)anObject - (BOOL) isEqual: (id)anObject
{ {
NSAffineTransformStruct ats;
if (anObject == self) if (anObject == self)
return YES; return YES;
if ([anObject isKindOfClass: self->isa] == NO) if ([anObject isKindOfClass: self->isa] == NO)
return NO; return NO;
if ([[anObject fontName] isEqual: fontName] == NO) if ([[anObject fontName] isEqual: fontName] == NO)
return NO; return NO;
ats = [[(NSFontDescriptor*)anObject matrix] transformStruct]; if (memcmp(matrix, [(NSFont*)anObject matrix], sizeof(matrix)) != 0)
if (ats.m11 != matrix[0]) return NO; 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;
return YES; return YES;
} }