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

Merge pull request #83 from filnet/warnings

Browse Source 
Fixed various compilation warnings on msys2
This commit is contained in:
OpenSceneGraph git repository
2016-06-14 08:52:54 +01:00
committed by GitHub
parent 69cc48b8f0 3d9aa3ef29
commit a236f18b17
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgViewer/GraphicsWindowWin32.cpp
View File

@@ -1674,9 +1674,9 @@ static int ChooseMatchingPixelFormat( HDC hdc, int screenNum, const WGLIntegerAt
1, // version number
PFD_DRAW_TO_WINDOW | // support window
PFD_SUPPORT_OPENGL | // support OpenGL
DWORD(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : NULL) | // double buffered ?
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : NULL) |
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : NULL),
DWORD(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : 0) | // double buffered ?
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : 0) |
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : 0),
PFD_TYPE_RGBA, // RGBA type
BYTE(_traits->red + _traits->green + _traits->blue), // color depth
BYTE(_traits->red), 0, BYTE(_traits->green), 0, BYTE(_traits->blue), 0, // shift bits ignored