[Vm-dev] [commit][3615] Don't use lrintf to convert from NSPoint
fields.
commits at squeakvm.org
commits at squeakvm.org
Fri Feb 19 22:37:28 UTC 2016
Revision: 3615
Author: eliot
Date: 2016-02-19 14:37:27 -0800 (Fri, 19 Feb 2016)
Log Message:
-----------
Don't use lrintf to convert from NSPoint fields. In 64-bits NSPoint's
fields are doubles, not floats. Simply use the default C conversion
from floating-point to integers provided by assignment.
Oversight from previous commit:
Eliminate erroneous casts to (int) in assigning to fields of sqInputEvent in
the platforms/iOS subsystem; (int) won't work with 64-bits.
Modified Paths:
--------------
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Feb 19 14:19:29 PST 2016
+ Fri Feb 19 14:33:44 PST 2016
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-19 22:23:01 UTC (rev 3614)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-19 22:37:27 UTC (rev 3615)
@@ -262,8 +262,8 @@
NSPoint local_point = [aView convertPoint: [theEvent locationInWindow] fromView:nil];
- evt.x = (sqInt) lrintf(local_point.x);
- evt.y = (sqInt) lrintf(local_point.y);
+ evt.x = local_point.x;
+ evt.y = local_point.y;
int buttonAndModifiers = [self mapMouseAndModifierStateToSqueakBits: theEvent];
evt.buttons = buttonAndModifiers & 0x07;
@@ -404,8 +404,8 @@
evt.type= EventTypeDragDropFiles;
evt.timeStamp= ioMSecs();
evt.dragType= dragType;
- evt.x = (sqInt) lrintf(local_point.x);
- evt.y = (sqInt) lrintf(local_point.y);
+ evt.x = local_point.x;
+ evt.y = local_point.y;
evt.modifiers= (buttonState >> 3);
evt.numFiles= numFiles;
evt.windowIndex = windowIndex;
More information about the Vm-dev
mailing list