diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-10 09:05:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-12-10 09:36:36 +0200 |
| commit | 7f78980ea260999c88878e362a4d6948d41ddbd8 (patch) | |
| tree | 2f650cadd2255174572876685f762cfa14145a23 /slideshow | |
| parent | 6981889b0ab9618defa81d7a59f87aada05adc5e (diff) | |
WaE: non-constant-expression cannot be narrowed to float in initializer list
More of the -Wc++11-narrowing warnings.
Change-Id: If371de0f480119d9b6f5fdc10b67484eb63c9d61
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index 963f0722b996..3a260e314976 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -379,7 +379,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta Window *pFrameWindow = pPWindow->GetWindow(WINDOW_FRAME); Size aFrameSize( pFrameWindow->GetSizePixel() ); Point aScreen( pPWindow->OutputToScreenPixel( Point() ) ); - GLWin.aInitFrame = (NSRect){ { aScreen.X(), aFrameSize.Height() - GLWin.Height - aScreen.Y() }, { GLWin.Width, GLWin.Height } }; + GLWin.aInitFrame = (NSRect){ { static_cast<CGFloat>(aScreen.X()), static_cast<CGFloat>(aFrameSize.Height() - GLWin.Height - aScreen.Y()) }, { static_cast<CGFloat>(GLWin.Width), static_cast<CGFloat>(GLWin.Height) } }; GLWin.pAquaOpenGLView = (AquaOpenGLView *)[[NSOpenGLView alloc]initWithFrame: GLWin.aInitFrame pixelFormat: fmt]; OSL_ENSURE(GLWin.pAquaOpenGLView, "Could not create NSOPenGLView"); |