FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed VS2015 compiler warnings

Browse Source
This commit is contained in:
Björn Blissing 2016-06-03 11:30:48 +01:00 committed by Robert Osfield
parent afe89e8d94
commit 66a1e564d7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgViewer/GraphicsWindowWin32.cpp
View File

@ -1674,20 +1674,20 @@ static int ChooseMatchingPixelFormat( HDC hdc, int screenNum, const WGLIntegerAt
1, // version number 1, // version number
PFD_DRAW_TO_WINDOW | // support window PFD_DRAW_TO_WINDOW | // support window
PFD_SUPPORT_OPENGL | // support OpenGL PFD_SUPPORT_OPENGL | // support OpenGL
(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : NULL) | // double buffered ? DWORD(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : NULL) | // double buffered ?
(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : NULL) | DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : NULL) |
(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : NULL), DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : NULL),
PFD_TYPE_RGBA, // RGBA type PFD_TYPE_RGBA, // RGBA type
_traits->red + _traits->green + _traits->blue, // color depth BYTE(_traits->red + _traits->green + _traits->blue), // color depth
_traits->red ,0, _traits->green ,0, _traits->blue, 0, // shift bits ignored BYTE(_traits->red), 0, BYTE(_traits->green), 0, BYTE(_traits->blue), 0, // shift bits ignored
_traits->alpha, // alpha buffer ? BYTE(_traits->alpha), // alpha buffer ?
0, // shift bit ignored 0, // shift bit ignored
0, // no accumulation buffer 0, // no accumulation buffer
0, 0, 0, 0, // accum bits ignored 0, 0, 0, 0, // accum bits ignored
_traits->depth, // 32 or 16 bit z-buffer ? BYTE(_traits->depth), // 32 or 16 bit z-buffer ?
_traits->stencil, // stencil buffer ? BYTE(_traits->stencil), // stencil buffer ?
0, // no auxiliary buffer 0, // no auxiliary buffer
PFD_MAIN_PLANE, // main layer PFD_MAIN_PLANE, // main layer
0, // reserved 0, // reserved
0, 0, 0 // layer masks ignored 0, 0, 0 // layer masks ignored
}; };
@ -2736,8 +2736,8 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
UINT scanCode = ::MapVirtualKeyEx( i, 0, ::GetKeyboardLayout(0)); UINT scanCode = ::MapVirtualKeyEx( i, 0, ::GetKeyboardLayout(0));
// Set Extended Key bit + Scan Code + 30 bit to indicate key was set before sending message // Set Extended Key bit + Scan Code + 30 bit to indicate key was set before sending message
// See Windows SDK help on WM_KEYDOWN for explanation // See Windows SDK help on WM_KEYDOWN for explanation
LONG lParam = rightSideCode | ( ( scanCode & 0xFF ) << 16 ) | (1 << 30); LONG lParamKey = rightSideCode | ( ( scanCode & 0xFF ) << 16 ) | (1 << 30);
::SendMessage(hwnd, WM_KEYDOWN, i, lParam ); ::SendMessage(hwnd, WM_KEYDOWN, i, lParamKey);
} }
} }
break; break;