summaryrefslogtreecommitdiff
path: root/src/video/cocoa
diff options
context:
space:
mode:
authorfonsinchen <fonsinchen@openttd.org>2013-08-10 12:47:24 +0000
committerfonsinchen <fonsinchen@openttd.org>2013-08-10 12:47:24 +0000
commit0baa72aff9737e17741b83c8a6d87891fb03bc0f (patch)
treecfb2f5ab859ce5cf7ebea2ef2724fe721466e213 /src/video/cocoa
parentfd16b0c65c1b65908f20527c010a83b6e7e4cf3b (diff)
downloadopenttd-0baa72aff9737e17741b83c8a6d87891fb03bc0f.tar.xz
(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0
Diffstat (limited to 'src/video/cocoa')
-rw-r--r--src/video/cocoa/cocoa_v.mm2
-rw-r--r--src/video/cocoa/wnd_quartz.mm10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index fb60a6f16..13264d6b1 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -961,7 +961,7 @@ static const char *Utf8AdvanceByUtf16Units(const char *str, NSUInteger count)
NSPoint view_pt = [ self convertPoint:[ [ self window ] convertScreenToBase:thePoint ] fromView:nil ];
- Point pt = { view_pt.x, [ self frame ].size.height - view_pt.y };
+ Point pt = { (int)view_pt.x, (int)[ self frame ].size.height - (int)view_pt.y };
const char *ch = _focused_window->GetTextCharacterAtPosition(pt);
if (ch == NULL) return NSNotFound;
diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm
index 3f1223eb5..12021631d 100644
--- a/src/video/cocoa/wnd_quartz.mm
+++ b/src/video/cocoa/wnd_quartz.mm
@@ -151,7 +151,7 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace()
/* Calculate total area we are blitting */
uint32 blitArea = 0;
for (int n = 0; n < dirtyRectCount; n++) {
- blitArea += dirtyRects[n].size.width * dirtyRects[n].size.height;
+ blitArea += (uint32)(dirtyRects[n].size.width * dirtyRects[n].size.height);
}
/*
@@ -335,10 +335,10 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
[ this->window setContentSize:contentRect.size ];
/* Ensure frame height - title bar height >= view height */
- contentRect.size.height = Clamp(height, 0, [ this->window frame ].size.height - 22 /* 22 is the height of title bar of window*/);
+ contentRect.size.height = Clamp(height, 0, (int)[ this->window frame ].size.height - 22 /* 22 is the height of title bar of window*/);
if (this->cocoaview != nil) {
- height = contentRect.size.height;
+ height = (int)contentRect.size.height;
[ this->cocoaview setFrameSize:contentRect.size ];
}
}
@@ -569,8 +569,8 @@ bool WindowQuartzSubdriver::WindowResized()
NSRect newframe = [ this->cocoaview frame ];
- this->window_width = newframe.size.width;
- this->window_height = newframe.size.height;
+ this->window_width = (int)newframe.size.width;
+ this->window_height = (int)newframe.size.height;
/* Create Core Graphics Context */
free(this->window_buffer);