Merge changes

libsdl-org · Sep 8, 2011 · 246c302 · 246c302
2 parents 6846d28 + 5620bd9
commit 246c302
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/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 */