mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0

release/1.4
fonsinchen 2013-08-10 12:47:24 +00:00
parent fd16b0c65c
commit 0baa72aff9
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx.cpp
View File

@ -437,9 +437,9 @@ static int DrawLayoutLine(ParagraphLayout::Line *line, int y, int left, int righ
/* Not a valid glyph (empty) */
if (glyph == 0xFFFF) continue;
int begin_x = run->getPositions()[i * 2] + left - offset_x;
int end_x = run->getPositions()[i * 2 + 2] + left - offset_x - 1;
int top = run->getPositions()[i * 2 + 1] + y;
int begin_x = (int)run->getPositions()[i * 2] + left - offset_x;
int end_x = (int)run->getPositions()[i * 2 + 2] + left - offset_x - 1;
int top = (int)run->getPositions()[i * 2 + 1] + y;
/* Truncated away. */
if (truncation && (begin_x < min_x || end_x > max_x)) continue;

6
src/gfx_layout.cpp
View File

@ -262,7 +262,7 @@ int ParagraphLayout::Line::getWidth() const
* the last run gives us the end of the line and thus the width.
*/
const VisualRun *run = this->getVisualRun(this->countRuns() - 1);
return run->getPositions()[run->getGlyphCount() * 2];
return (int)run->getPositions()[run->getGlyphCount() * 2];
}
/**
@ -593,8 +593,8 @@ const char *Layouter::GetCharAtPosition(int x) const
/* Not a valid glyph (empty). */
if (run->getGlyphs()[i] == 0xFFFF) continue;
int begin_x = run->getPositions()[i * 2];
int end_x = run->getPositions()[i * 2 + 2];
int begin_x = (int)run->getPositions()[i * 2];
int end_x = (int)run->getPositions()[i * 2 + 2];
if (IsInsideMM(x, begin_x, end_x)) {
/* Found our glyph, now convert to UTF-8 string index. */

4
src/industry_gui.cpp
View File

@ -2583,7 +2583,7 @@ struct IndustryCargoesWindow : public Window {
delete lst;
break;
}
int selected = (this->ind_cargo >= NUM_INDUSTRYTYPES) ? this->ind_cargo - NUM_INDUSTRYTYPES : -1;
int selected = (this->ind_cargo >= NUM_INDUSTRYTYPES) ? (int)(this->ind_cargo - NUM_INDUSTRYTYPES) : -1;
ShowDropDownList(this, lst, selected, WID_IC_CARGO_DROPDOWN, 0, true);
break;
}
@ -2600,7 +2600,7 @@ struct IndustryCargoesWindow : public Window {
delete lst;
break;
}
int selected = (this->ind_cargo < NUM_INDUSTRYTYPES) ? this->ind_cargo : -1;
int selected = (this->ind_cargo < NUM_INDUSTRYTYPES) ? (int)this->ind_cargo : -1;
ShowDropDownList(this, lst, selected, WID_IC_IND_DROPDOWN, 0, true);
break;
}

2
src/sound/cocoa_s.cpp
View File

@ -67,7 +67,7 @@ const char *SoundDriver_Cocoa::Start(const char * const *parm)
requestedDesc.mBytesPerFrame = requestedDesc.mBitsPerChannel * requestedDesc.mChannelsPerFrame / 8;
requestedDesc.mBytesPerPacket = requestedDesc.mBytesPerFrame * requestedDesc.mFramesPerPacket;
MxInitialize(requestedDesc.mSampleRate);
MxInitialize((uint)requestedDesc.mSampleRate);
/* Locate the default output audio unit */
desc.componentType = kAudioUnitType_Output;

2
src/video/cocoa/cocoa_v.mm
View File

@ -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;

10
src/video/cocoa/wnd_quartz.mm
View File

@ -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);