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

msys2: fixed converting to non-pointer type 'long long int' from NULL

Browse Source
This commit is contained in:
Philippe Renon 2016-06-11 17:43:07 +02:00
parent 9f456a2722
commit bc1185c41a
1 changed files with 3 additions and 3 deletions
Show Stats 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 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
DWORD(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : NULL) | // double buffered ? DWORD(_traits->doubleBuffer ? PFD_DOUBLEBUFFER : 0) | // double buffered ?
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : NULL) | DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_COPY ? PFD_SWAP_COPY : 0) |
DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : NULL), DWORD(_traits->swapMethod == osg::DisplaySettings::SWAP_EXCHANGE ? PFD_SWAP_EXCHANGE : 0),
PFD_TYPE_RGBA, // RGBA type PFD_TYPE_RGBA, // RGBA type
BYTE(_traits->red + _traits->green + _traits->blue), // color depth BYTE(_traits->red + _traits->green + _traits->blue), // color depth
BYTE(_traits->red), 0, BYTE(_traits->green), 0, BYTE(_traits->blue), 0, // shift bits ignored BYTE(_traits->red), 0, BYTE(_traits->green), 0, BYTE(_traits->blue), 0, // shift bits ignored