Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge changes

  • Loading branch information
ferzkopp committed Sep 8, 2011
2 parents 6846d28 + 5620bd9 commit 246c302c6a070171ba48bcce377cfef1dad495b0
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/video/cocoa/SDL_cocoawindow.m
@@ -401,7 +401,7 @@ - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event
enumerator = [touches objectEnumerator];
touch = (NSTouch*)[enumerator nextObject];
while (touch) {
SDL_TouchID touchId = (SDL_TouchID)[touch device];
const SDL_TouchID touchId = (SDL_TouchID) ((size_t) [touch device]);
if (!SDL_GetTouch(touchId)) {
SDL_Touch touch;

@@ -421,7 +421,7 @@ - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event
}
}

SDL_FingerID fingerId = (SDL_FingerID)[touch identity];
const SDL_FingerID fingerId = (SDL_FingerID) ((size_t) [touch identity]);
float x = [touch normalizedPosition].x;
float y = [touch normalizedPosition].y;
/* Make the origin the upper left instead of the lower left */

0 comments on commit 246c302

Please sign in to comment.